Changes to m4/configure.ac,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/06/16 03:51:29

Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- configure.ac        13 Jun 2006 01:19:09 -0000      1.46
+++ configure.ac        16 Jun 2006 03:51:28 -0000      1.47
@@ -60,18 +60,17 @@
 dnl package-specific prefix.  FIXME - consistently use M4_ in the m4 macros
 dnl that feed the creation of configure.
 m4_pattern_forbid([^M4_])
-m4_pattern_allow([^m4_cv_])
+m4_pattern_allow([^M4_cv_])
 
+AC_DEFUN([M4_DEFAULT_PRELOAD], [m4 traditional gnu])
 AC_MSG_CHECKING([for modules to preload])
-  m4_pattern_allow([^m4_default_preload$])
-  m4_default_preload="m4 traditional gnu"
   DLPREOPEN=
 
   AC_ARG_WITH([modules],
     [AS_HELP_STRING([--with-modules=MODULES],
-                   [preload MODULES @<:@default: $m4_default_preload@:>@])],
+                   [preload MODULES @<:@default: ]M4_DEFAULT_PRELOAD[@:>@])],
     [use_modules="$withval"],
-    [use_modules="$m4_default_preload"])
+    [use_modules="$M4_DEFAULT_PRELOAD"])
 
   PREOPEN_DEPENDENCIES=
   DLPREOPEN="-dlpreopen force"
@@ -106,7 +105,7 @@
 
 AC_PROG_CPP
 AM_PROG_CC_C_O
-m4_CHECK_DEBUGGING
+M4_CHECK_DEBUGGING
 
 
 
@@ -122,7 +121,7 @@
 case "$CFLAGS" in
   *-pipe* ) ;;
         * ) _LT_COMPILER_OPTION([if $compiler supports -pipe],
-                [m4_cv_prog_compiler_pipe],
+                [M4_cv_prog_compiler_pipe],
                 [-pipe -c conftest.$ac_ext], [],
                 [CFLAGS="$CFLAGS -pipe"])
               ;;
@@ -135,7 +134,7 @@
 ## ---------------- ##
 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION([0.14.1])
-m4_GNU_GETTEXT
+M4_GNU_GETTEXT
 
 
 
@@ -145,10 +144,10 @@
 M4_INIT
 
 # Gnulib doesn't always do things quite the way M4 would like...
-m4_ERROR
-m4_GETOPT
-m4_OBSTACK
-m4_REGEX
+M4_ERROR
+M4_GETOPT
+M4_OBSTACK
+M4_REGEX
 
 
 ## ------------------------ ##
@@ -188,7 +187,7 @@
 
 AM_WITH_DMALLOC
 
-m4_SYS_STACKOVF
+M4_SYS_STACKOVF
 
 # This is for the modules
 AC_STRUCT_TM
@@ -196,7 +195,7 @@
 AC_CHECK_FUNCS([getcwd gethostname mktime uname \
                setenv unsetenv putenv clearenv])
 
-m4_LIB_GMP
+M4_LIB_GMP
 AM_CONDITIONAL([USE_GMP], [test "x$USE_GMP" = xyes])