--- aclocal/C++_Support/ac_cxx_template_keyword_qualifier.m4.old	2004-02-04 23:55:20.404459029 +0100
+++ aclocal/C++_Support/ac_cxx_template_keyword_qualifier.m4	2004-02-04 23:59:29.237949202 +0100
@@ -12,9 +12,18 @@ ac_cv_cxx_template_keyword_qualifier,
 [AC_LANG_SAVE
  AC_LANG_CPLUSPLUS
  AC_TRY_COMPILE([
-class A { public : A() {}; template<class T> static T convert() { return T(); }
-};
-],[double z = A::template convert<double>(); return 0;],
+  class X
+  {
+    public:
+    template<int> void member() {}
+    template<int> static void static_member() {}
+  };
+  template<class T> void f(T* p)
+  {
+    p->template member<200>(); // OK: < starts template argument
+    T::template static_member<100>(); // OK: < starts explicit qualification
+  }
+],[X x; f(&x); return 0;],
  ac_cv_cxx_template_keyword_qualifier=yes, ac_cv_cxx_template_keyword_qualifier=no)
  AC_LANG_RESTORE
 ])