AC_PROG_GNU_M4 should actually be private to the package

Autoconf.

* acspecific.m4 (AC_PROG_GNU_M4): Move to...
* m4/m4.m4: here.
* m4/Makefile.am (EXTRA_DIST): Adjust.
* doc/autoconf.texi (Particular Programs): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 28cb63f9e946a7ef0b8c62885cfb35b06332e5ca..f3d717ec57612e918c7dc8a82de4d6c54b585c63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-05-23  Akim Demaille  <akim@epita.fr>
+
+       AC_PROG_GNU_M4 should actually be private to the package
+       Autoconf.
+
+       * acspecific.m4 (AC_PROG_GNU_M4): Move to...
+       * m4/m4.m4: here.
+       * m4/Makefile.am (EXTRA_DIST): Adjust.
+       * doc/autoconf.texi (Particular Programs): Adjust.
+
 2000-05-23  Akim Demaille  <akim@epita.fr>
 
        * doc/autoconf.texi (Exiting from Shell Scripts): Move contents

diff --git a/acspecific.m4 b/acspecific.m4
index 4d06a7c83119f94a0e56926b7221623fd4216fb4..0e1c93f17fb33c597da6911e8b3416b4242edcb8 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -81,20 +81,6 @@ AC_SUBST(ECHO_T)dnl
 ])# _AC_PROG_ECHO
 
 
-# AC_PROG_GNU_M4
-# --------------
-# Check for GNU m4, at least 1.3 (supports frozen files).
-AC_DEFUN([AC_PROG_GNU_M4],
-[AC_PATH_PROGS(M4, gm4 gnum4 m4, m4)
-AC_CACHE_CHECK(whether m4 supports frozen files, ac_cv_prog_gnu_m4,
-[ac_cv_prog_gnu_m4=no
-if test x"$M4" != x; then
-  case `$M4 --help < /dev/null 2>&1` in
-    *reload-state*) ac_cv_prog_gnu_m4=yes ;;
-  esac
-fi])])
-
-
 # AC_PROG_MAKE_SET
 # ----------------
 # Define SET_MAKE to set ${MAKE} if make doesn't.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 8ebc5ee1e19b3c2755502fd5d656835425802a3e..2c6c93436f2aa4e1a57be365e000b9fd4ccce3bf 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2550,13 +2550,6 @@ not found in standard @code{install} programs, there is no reason to use
 @file{Makefile.in} files.
 @end defmac
 
-@defmac AC_PROG_GNU_M4
-@maindex PROG_GNU_M4
-@ovindex GNU_M4
-If @sc{gnu} @code{m4} version 1.4 or above is found, set output variable
-@code{M4} to @samp{m4}.
-@end defmac
-
 @defmac AC_PROG_LEX
 @maindex PROG_LEX
 @ovindex LEX

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 4d06a7c83119f94a0e56926b7221623fd4216fb4..0e1c93f17fb33c597da6911e8b3416b4242edcb8 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -81,20 +81,6 @@ AC_SUBST(ECHO_T)dnl
 ])# _AC_PROG_ECHO
 
 
-# AC_PROG_GNU_M4
-# --------------
-# Check for GNU m4, at least 1.3 (supports frozen files).
-AC_DEFUN([AC_PROG_GNU_M4],
-[AC_PATH_PROGS(M4, gm4 gnum4 m4, m4)
-AC_CACHE_CHECK(whether m4 supports frozen files, ac_cv_prog_gnu_m4,
-[ac_cv_prog_gnu_m4=no
-if test x"$M4" != x; then
-  case `$M4 --help < /dev/null 2>&1` in
-    *reload-state*) ac_cv_prog_gnu_m4=yes ;;
-  esac
-fi])])
-
-
 # AC_PROG_MAKE_SET
 # ----------------
 # Define SET_MAKE to set ${MAKE} if make doesn't.

diff --git a/m4/Makefile.am b/m4/Makefile.am
index bce3a93404a61f7ce92b5c149076173feb45cac4..e52fff873a7429d5a37928a095756f91c987d37e 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,3 +1,8 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = init.m4 missing.m4 sanity.m4 atconfig.m4
+EXTRA_DIST = \
+atconfig.m4 \
+init.m4 \
+m4.m4 \
+missing.m4 \
+sanity.m4

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 6f1d1215965b355ebce86a434f5a4d84810da7fd..40964f528aac5b07e7754b5e7c5d9ce3f46f358b 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -64,7 +64,8 @@ PERL = @PERL@
 PERLSCRIPTS = @PERLSCRIPTS@
 standards_texi = @standards_texi@
 
-EXTRA_DIST = init.m4 missing.m4 sanity.m4 atconfig.m4
+EXTRA_DIST =  atconfig.m4 init.m4 m4.m4 missing.m4 sanity.m4
+
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in

diff --git a/m4/m4.m4 b/m4/m4.m4
new file mode 100644 (file)
index 0000000..2033dfd
--- /dev/null
+++ b/m4/m4.m4
@@ -0,0 +1,12 @@
+# AC_PROG_GNU_M4
+# --------------
+# Check for GNU m4, at least 1.3 (supports frozen files).
+AC_DEFUN([AC_PROG_GNU_M4],
+[AC_PATH_PROGS(M4, gm4 gnum4 m4, m4)
+AC_CACHE_CHECK(whether m4 supports frozen files, ac_cv_prog_gnu_m4,
+[ac_cv_prog_gnu_m4=no
+if test x"$M4" != x; then
+  case `$M4 --help < /dev/null 2>&1` in
+    *reload-state*) ac_cv_prog_gnu_m4=yes ;;
+  esac
+fi])])