2006-06-02  Stepan Kasal  <address@hidden>

	* lib/m4sugar/m4sugar.m4 (m4_require): Modify the error
	message issued by AC_REQUIRE.

Index: lib/m4sugar/m4sugar.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sugar.m4,v
retrieving revision 2.97
diff -u -r2.97 m4sugar.m4
--- lib/m4sugar/m4sugar.m4	20 Feb 2006 21:43:06 -0000	2.97
+++ lib/m4sugar/m4sugar.m4	2 Jun 2006 11:37:01 -0000
@@ -1249,7 +1249,8 @@
 [m4_ifdef([_m4_expanding($1)],
 	 [m4_fatal([$0: circular dependency of $1])])dnl
 m4_ifndef([_m4_divert_dump],
-	  [m4_fatal([$0($1): cannot be used outside of an m4_defun'd macro])])dnl
+	  [m4_fatal([$0($1): cannot be used outside of an ]dnl
+m4_bmatch([$0], [^AC_], [AC_DEFUN], [m4_defun])['d macro])])dnl
 m4_provide_if([$1],
 	      [],
 	      [_m4_require_call([$1], [$2])])dnl