Regenerate.

diff --git a/Makefile.in b/Makefile.in
index 0b4e57ff525ed9625a2086b06f04c8e658c81148..dfb5b77c5d50871b445b5597d4d11a0dbab2b639 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,6 +92,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/bin/Makefile.in b/bin/Makefile.in
index f52545214a5caaeda10af583ae16faafb1de7f2a..2ac98cc120c09d898cb0376014101288ff3220b8 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -66,6 +66,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -116,20 +117,24 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SUFFIXES = .m4 .m4f
+AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
 # checks if we are independent of Autoconf by defining AUTOM4TE (and
-# others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
+# others) to `false'.  Autoconf provides autom4te, so that doesn't
 # apply to us.
-MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
+MY_AUTOM4TE = \
+       autom4te_perllibdir='$(top_srcdir)'/lib                                 \
+       AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te     \
+               -B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+
 
 # Factor the dependencies between all the frozen files.
 # Some day we should explain to Automake how to use autom4te to compute
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
+m4f_dependencies = $(top_builddir)/bin/autom4te $(AUTOM4TE_CFG)
 m4sugar_m4f_dependencies = \
        $(m4f_dependencies)                     \
        $(src_libdir)/m4sugar/m4sugar.m4        \
@@ -177,17 +182,15 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-GREP = @GREP@
 bin_SCRIPTS = autom4te \
              autoconf autoheader autoreconf ifnames autoscan autoupdate
 
-EXTRA_DIST = autoconf.in autoheader.in autoreconf.in autoupdate.in ifnames.in \
-            autoscan.in autom4te.in \
-            autoconf.as
+EXTRA_DIST = autoconf.as autoheader.in autoreconf.in autoupdate.in ifnames.in \
+            autoscan.in autom4te.in
 
 
 # Files that should be removed, but which Automake does not know.
-CLEANFILES = $(bin_SCRIPTS)
+CLEANFILES = $(bin_SCRIPTS) autoconf.in
 edit = sed \
        -e 's,@SHELL\@,$(SHELL),g' \
        -e 's,@PERL\@,$(PERL),g' \
@@ -203,9 +206,6 @@ edit = sed \
        -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
        -e 's,@configure_input\@,Generated from $@.in; do not edit by hand.,g'
 
-
-# autoconf is written in M4sh.
-AUTOM4SH = $(top_builddir)/tests/autom4te --language M4sh --cache ''
 TAGS_DEPENDENCIES = $(EXTRA_DIST)
 letters = abcdefghijklmnopqrstuvwxyz
 LETTERS = ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -437,8 +437,6 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info-am
        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
        uninstall-am uninstall-binSCRIPTS uninstall-info-am
 
-$(MY_AUTOM4TE): $(top_srcdir)/tests/wrapper.in
-       cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) autom4te
 $(AUTOM4TE_CFG): $(top_srcdir)/lib/autom4te.in
        cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) autom4te.cfg
 
@@ -469,12 +467,14 @@ check-forbidden-patterns:
        else \
          rm -f forbidden.log; \
        fi
-$(srcdir)/autoconf.in: $(srcdir)/autoconf.as $(m4sh_m4f_dependencies)
-       $(AUTOM4SH) $(srcdir)/autoconf.as -o $@
 
-autoconf: $(srcdir)/autoconf.in Makefile
+# autoconf is written in M4sh.
+autoconf.in: $(srcdir)/autoconf.as $(m4sh_m4f_dependencies)
+       $(MY_AUTOM4TE) --language M4sh --cache '' $(srcdir)/autoconf.as -o $@
+
+autoconf: autoconf.in Makefile
        rm -f autoconf autoconf.tmp
-       $(edit) $(srcdir)/autoconf.in >autoconf.tmp
+       $(edit) autoconf.in >autoconf.tmp
        chmod +x autoconf.tmp
        chmod a-w autoconf.tmp
        mv -f autoconf.tmp autoconf

diff --git a/config/Makefile.in b/config/Makefile.in
index df3d1436dcae88b888e6dfd711f694015b13452d..c26799826f2330ef417c1c641c9f33dd6b9f7011 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -61,6 +61,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/configure b/configure
index e41670ce9987816eab2fe54623ba01c7749cf081..56fe950f70f8080da6fdcb477c668b8e67a3749c 100755 (executable)
--- a/configure
+++ b/configure
@@ -2000,26 +2000,12 @@ echo "$as_me:$LINENO: result: $ac_cv_sh_n_works" >&5
 echo "${ECHO_T}$ac_cv_sh_n_works" >&6
 
 
-# Initialize the test suite and build position independent wrappers.
+# Initialize the test suite.
           ac_config_commands="$ac_config_commands tests/atconfig"
 
 
                     ac_config_files="$ac_config_files tests/Makefile tests/atlocal"
 
-          ac_config_files="$ac_config_files tests/autoconf:tests/wrapper.in"
-
-          ac_config_files="$ac_config_files tests/autoheader:tests/wrapper.in"
-
-          ac_config_files="$ac_config_files tests/autom4te:tests/wrapper.in"
-
-          ac_config_files="$ac_config_files tests/autoreconf:tests/wrapper.in"
-
-          ac_config_files="$ac_config_files tests/autoscan:tests/wrapper.in"
-
-          ac_config_files="$ac_config_files tests/autoupdate:tests/wrapper.in"
-
-          ac_config_files="$ac_config_files tests/ifnames:tests/wrapper.in"
-
 # Extract the first word of "expr", so it can be a program name with args.
 set dummy expr; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3039,13 +3025,6 @@ do
   "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
   "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
   "tests/atlocal" ) CONFIG_FILES="$CONFIG_FILES tests/atlocal" ;;
-  "tests/autoconf" ) CONFIG_FILES="$CONFIG_FILES tests/autoconf:tests/wrapper.in" ;;
-  "tests/autoheader" ) CONFIG_FILES="$CONFIG_FILES tests/autoheader:tests/wrapper.in" ;;
-  "tests/autom4te" ) CONFIG_FILES="$CONFIG_FILES tests/autom4te:tests/wrapper.in" ;;
-  "tests/autoreconf" ) CONFIG_FILES="$CONFIG_FILES tests/autoreconf:tests/wrapper.in" ;;
-  "tests/autoscan" ) CONFIG_FILES="$CONFIG_FILES tests/autoscan:tests/wrapper.in" ;;
-  "tests/autoupdate" ) CONFIG_FILES="$CONFIG_FILES tests/autoupdate:tests/wrapper.in" ;;
-  "tests/ifnames" ) CONFIG_FILES="$CONFIG_FILES tests/ifnames:tests/wrapper.in" ;;
   "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
   "lib/emacs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/emacs/Makefile" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -3412,16 +3391,6 @@ s,@INSTALL@,$ac_INSTALL,;t t
     rm -f $tmp/out
   fi
 
-  # Run the commands associated with the file.
-  case $ac_file in
-    tests/autoconf ) chmod +x tests/autoconf ;;
-    tests/autoheader ) chmod +x tests/autoheader ;;
-    tests/autom4te ) chmod +x tests/autom4te ;;
-    tests/autoreconf ) chmod +x tests/autoreconf ;;
-    tests/autoscan ) chmod +x tests/autoscan ;;
-    tests/autoupdate ) chmod +x tests/autoupdate ;;
-    tests/ifnames ) chmod +x tests/ifnames ;;
-  esac
 done
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 86de52c5a92a059b6677a24e59fead6d2daebbeb..a64e1b0919c20e734d8548889926b5f23e67cf0d 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -74,6 +74,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in
index 27bed454c86944a6e8b38d1474299b910d2d30ac..bec26c956296096a3e3c36051e89a1a46769c4b2 100644 (file)
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -72,6 +72,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 45486b959df6bb01f7fba160eb8b4680d818803c..1bae662eccf1f43a44bc7b63651d8018a6c226d1 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -78,6 +78,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index 9b9db2dfb96ca648bd8ccd27e8459063862d9687..9bfb0c2962f068a19858015bf49d70c2bb013900 100644 (file)
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -74,6 +74,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -138,20 +139,24 @@ ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 forbidden_patterns = -e '^_*EOF' -e ' cmp '
 forbidden_patterns_files = $(dist_autoconflib_DATA)
 SUFFIXES = .m4 .m4f
+AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
 # checks if we are independent of Autoconf by defining AUTOM4TE (and
-# others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
+# others) to `false'.  Autoconf provides autom4te, so that doesn't
 # apply to us.
-MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
+MY_AUTOM4TE = \
+       autom4te_perllibdir='$(top_srcdir)'/lib                                 \
+       AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te     \
+               -B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+
 
 # Factor the dependencies between all the frozen files.
 # Some day we should explain to Automake how to use autom4te to compute
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
+m4f_dependencies = $(top_builddir)/bin/autom4te $(AUTOM4TE_CFG)
 m4sugar_m4f_dependencies = \
        $(m4f_dependencies)                     \
        $(src_libdir)/m4sugar/m4sugar.m4        \
@@ -199,7 +204,6 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-GREP = @GREP@
 all: all-am
 
 .SUFFIXES:
@@ -443,8 +447,6 @@ uninstall-am: uninstall-dist_autoconflibDATA uninstall-info-am \
 check-local: check-forbidden-patterns
 
 autoconf.m4f: $(autoconf_m4f_dependencies)
-$(MY_AUTOM4TE): $(top_srcdir)/tests/wrapper.in
-       cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) autom4te
 $(AUTOM4TE_CFG): $(top_srcdir)/lib/autom4te.in
        cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) autom4te.cfg
 

diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index d4a760cb3328db74ff0dab4a8f93ac4a88c14694..4d16459ab4cd62aa9ce1ce6c6ada027219f86b39 100644 (file)
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -70,6 +70,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -124,20 +125,24 @@ EXTRA_DIST = autoscan.pre
 nodist_autoscanlib_DATA = autoscan.list
 CLEANFILES = autoscan.list
 SUFFIXES = .m4 .m4f
+AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
 # checks if we are independent of Autoconf by defining AUTOM4TE (and
-# others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
+# others) to `false'.  Autoconf provides autom4te, so that doesn't
 # apply to us.
-MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
+MY_AUTOM4TE = \
+       autom4te_perllibdir='$(top_srcdir)'/lib                                 \
+       AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te     \
+               -B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+
 
 # Factor the dependencies between all the frozen files.
 # Some day we should explain to Automake how to use autom4te to compute
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
+m4f_dependencies = $(top_builddir)/bin/autom4te $(AUTOM4TE_CFG)
 m4sugar_m4f_dependencies = \
        $(m4f_dependencies)                     \
        $(src_libdir)/m4sugar/m4sugar.m4        \
@@ -185,7 +190,6 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-GREP = @GREP@
 all: all-am
 
 .SUFFIXES:
@@ -360,8 +364,6 @@ uninstall-am: uninstall-info-am uninstall-nodist_autoscanlibDATA
        pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
        uninstall-nodist_autoscanlibDATA
 
-$(MY_AUTOM4TE): $(top_srcdir)/tests/wrapper.in
-       cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) autom4te
 $(AUTOM4TE_CFG): $(top_srcdir)/lib/autom4te.in
        cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) autom4te.cfg
 

diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index 753c6e81ab93a3092f04eb845679313b8ae559f5..2481db052564f24d1648522b79f5dc567c2a3970 100644 (file)
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -74,6 +74,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -132,20 +133,24 @@ ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 forbidden_patterns = -e '^_*EOF' -e ' cmp '
 forbidden_patterns_files = $(dist_autotestlib_DATA)
 SUFFIXES = .m4 .m4f
+AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
 # checks if we are independent of Autoconf by defining AUTOM4TE (and
-# others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
+# others) to `false'.  Autoconf provides autom4te, so that doesn't
 # apply to us.
-MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
+MY_AUTOM4TE = \
+       autom4te_perllibdir='$(top_srcdir)'/lib                                 \
+       AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te     \
+               -B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+
 
 # Factor the dependencies between all the frozen files.
 # Some day we should explain to Automake how to use autom4te to compute
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
+m4f_dependencies = $(top_builddir)/bin/autom4te $(AUTOM4TE_CFG)
 m4sugar_m4f_dependencies = \
        $(m4f_dependencies)                     \
        $(src_libdir)/m4sugar/m4sugar.m4        \
@@ -193,7 +198,6 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-GREP = @GREP@
 all: all-am
 
 .SUFFIXES:
@@ -437,8 +441,6 @@ uninstall-am: uninstall-dist_autotestlibDATA uninstall-info-am \
 check-local: check-forbidden-patterns
 
 autotest.m4f: $(autotest_m4f_dependencies)
-$(MY_AUTOM4TE): $(top_srcdir)/tests/wrapper.in
-       cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) autom4te
 $(AUTOM4TE_CFG): $(top_srcdir)/lib/autom4te.in
        cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) autom4te.cfg
 

diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index 8d7b69fa57c29e99cbc96d622870d8c1c976ed1b..fdc36937a4a91741206340acd06b2bd0106c0cfb 100644 (file)
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -74,6 +74,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index d4df1aa090aba1ae7b4d24b717274eff48ccaac2..cb4b9eb386fc11450af7a9782b703facd8899a27 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -74,6 +74,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -132,20 +133,24 @@ ETAGS_ARGS = $(ETAGS_FOR_AUTOCONF)
 forbidden_patterns = -e '^_*EOF' -e ' cmp '
 forbidden_patterns_files = $(dist_m4sugarlib_DATA)
 SUFFIXES = .m4 .m4f
+AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
 # checks if we are independent of Autoconf by defining AUTOM4TE (and
-# others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
+# others) to `false'.  Autoconf provides autom4te, so that doesn't
 # apply to us.
-MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
+MY_AUTOM4TE = \
+       autom4te_perllibdir='$(top_srcdir)'/lib                                 \
+       AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te     \
+               -B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+
 
 # Factor the dependencies between all the frozen files.
 # Some day we should explain to Automake how to use autom4te to compute
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
+m4f_dependencies = $(top_builddir)/bin/autom4te $(AUTOM4TE_CFG)
 m4sugar_m4f_dependencies = \
        $(m4f_dependencies)                     \
        $(src_libdir)/m4sugar/m4sugar.m4        \
@@ -193,7 +198,6 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-GREP = @GREP@
 all: all-am
 
 .SUFFIXES:
@@ -452,8 +456,6 @@ check-local: check-forbidden-patterns
 
 m4sugar.m4f: $(m4sugar_m4f_dependencies)
 m4sh.m4f: $(m4sh_m4f_dependencies)
-$(MY_AUTOM4TE): $(top_srcdir)/tests/wrapper.in
-       cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) autom4te
 $(AUTOM4TE_CFG): $(top_srcdir)/lib/autom4te.in
        cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) autom4te.cfg
 

diff --git a/man/Makefile.in b/man/Makefile.in
index e6fcbdf867c7e186c69b0b23bb828661b9171c6e..5482eb1bc38e97e79dc7ec12e6d7e03cd43807f2 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -64,6 +64,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4653787205fe207832dbe275ca873f6b38dc54b6..b9e9709d01334c14f2211fd02ffc87d037b7d388 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -34,8 +34,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/../lib/freeze.mk $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/atlocal.in \
-       $(srcdir)/wrapper.in
+       $(srcdir)/Makefile.in $(srcdir)/atlocal.in
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \
@@ -43,8 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES = atlocal autoconf autoheader autom4te autoreconf \
-       autoscan autoupdate ifnames
+CONFIG_CLEAN_FILES = atlocal
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -62,6 +60,7 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
+GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -121,23 +120,26 @@ EXTRA_DIST = $(TESTSUITE_AT) local.at mktests.sh \
 # Running the uninstalled scripts.
 check_SCRIPTS = autoconf autoheader autoreconf autom4te autoscan autoupdate ifnames
 DISTCLEANFILES = atconfig atlocal $(TESTSUITE) $(check_SCRIPTS)
-MAINTAINERCLEANFILES = Makefile.in $(srcdir)/wrapper.in \
-       $(TESTSUITE_GENERATED_AT)
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE_GENERATED_AT)
 SUFFIXES = .m4 .m4f
+AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
 # Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
 # checks if we are independent of Autoconf by defining AUTOM4TE (and
-# others) to `false'.  But we _ship_ tests/autom4te, so it doesn't
+# others) to `false'.  Autoconf provides autom4te, so that doesn't
 # apply to us.
-MY_AUTOM4TE = $(top_builddir)/tests/autom4te
-AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
+MY_AUTOM4TE = \
+       autom4te_perllibdir='$(top_srcdir)'/lib                                 \
+       AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te     \
+               -B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+
 
 # Factor the dependencies between all the frozen files.
 # Some day we should explain to Automake how to use autom4te to compute
 # the dependencies...
 src_libdir = $(top_srcdir)/lib
 build_libdir = $(top_builddir)/lib
-m4f_dependencies = $(MY_AUTOM4TE) $(AUTOM4TE_CFG)
+m4f_dependencies = $(top_builddir)/bin/autom4te $(AUTOM4TE_CFG)
 m4sugar_m4f_dependencies = \
        $(m4f_dependencies)                     \
        $(src_libdir)/m4sugar/m4sugar.m4        \
@@ -185,7 +187,16 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
-GREP = @GREP@
+wrappers = autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames
+
+# The hairy heredoc is more robust than using echo.
+CLEANFILES = wrapper.in $(wrappers) expr
+edit = sed \
+       -e 's,@wrap_program\@,$@,g' \
+       -e 's,@abs_top_srcdir\@,@abs_top_srcdir@,g' \
+       -e 's,@abs_top_builddir\@,@abs_top_builddir@,g' \
+       -e 's,@configure_input\@,Generated from $<.,g'
+
 TESTSUITE_GENERATED_AT = \
        aclang.at acc.at acfortran.at \
        acgeneral.at acstatus.at \
@@ -227,9 +238,6 @@ AUTOCONF_FILES = $(autoconfdir)/general.m4 \
                 $(autoconfdir)/types.m4        \
                 $(autoconfdir)/programs.m4
 
-
-# The hairy heredoc is more robust than using echo.
-CLEANFILES = expr
 all: all-am
 
 .SUFFIXES:
@@ -265,20 +273,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 atlocal: $(top_builddir)/config.status $(srcdir)/atlocal.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoconf: $(top_builddir)/config.status $(srcdir)/wrapper.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoheader: $(top_builddir)/config.status $(srcdir)/wrapper.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autom4te: $(top_builddir)/config.status $(srcdir)/wrapper.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoreconf: $(top_builddir)/config.status $(srcdir)/wrapper.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoscan: $(top_builddir)/config.status $(srcdir)/wrapper.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoupdate: $(top_builddir)/config.status $(srcdir)/wrapper.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ifnames: $(top_builddir)/config.status $(srcdir)/wrapper.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -404,8 +398,6 @@ uninstall-am: uninstall-info-am
        mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
        uninstall-info-am
 
-$(MY_AUTOM4TE): $(top_srcdir)/tests/wrapper.in
-       cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) autom4te
 $(AUTOM4TE_CFG): $(top_srcdir)/lib/autom4te.in
        cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) autom4te.cfg
 
@@ -449,8 +441,15 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
          echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
        } >$(srcdir)/package.m4
 
-$(srcdir)/wrapper.in: $(srcdir)/wrapper.as $(m4sh_m4f_dependencies)
-       ./autom4te --language=M4sh $(srcdir)/wrapper.as -o $@
+wrapper.in: $(srcdir)/wrapper.as $(m4sh_m4f_dependencies)
+       $(MY_AUTOM4TE) --language=M4sh $(srcdir)/wrapper.as -o $@
+
+$(wrappers): wrapper.in
+       rm -f $@ $@.tmp
+       $(edit) wrapper.in >$@.tmp
+       chmod +x $@.tmp
+       chmod a-w $@.tmp
+       mv -f $@.tmp $@
 $(TESTSUITE): $(srcdir)/package.m4 \
              local.at \
              $(TESTSUITE_AT) \