* tests/autoreconf.in, tests/autom4te.in, tests/autoupdate.in:

Remove, replaced by...
* tests/wrappl.in: Be common for all the Perl executables.
In particular autoscan and autoheader want -I.
* configure.ac: Adjust.
* lib/autoscan/headers: errno.h is portable.

diff --git a/ChangeLog b/ChangeLog
index 1c57aaacb0b32972fdaac035ed088eca8d262145..deba39bb865a48874c79ab32784e409264afa137 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-26  Akim Demaille  <akim@epita.fr>
+
+       * tests/autoreconf.in, tests/autom4te.in, tests/autoupdate.in:
+       Remove, replaced by...
+       * tests/wrappl.in: Be common for all the Perl executables.
+       In particular autoscan and autoheader want -I.
+       * configure.ac: Adjust.
+       * lib/autoscan/headers: errno.h is portable.
+
 2001-11-26  Akim Demaille  <akim@epita.fr>
 
        * bin/autoscan.in (used): New.

diff --git a/configure b/configure
index c27585db1383757a38f5d1879883fcb16c16c7a6..868f8fca7f4bf6a141324781245fd48cf2970f70 100755 (executable)
--- a/configure
+++ b/configure
@@ -1454,13 +1454,13 @@ ac_config_files="$ac_config_files tests/autoconf:tests/wrapsh.in"
 
 ac_config_files="$ac_config_files tests/autoheader:tests/wrappl.in"
 
-ac_config_files="$ac_config_files tests/autom4te"
+ac_config_files="$ac_config_files tests/autom4te:tests/wrappl.in"
 
 ac_config_files="$ac_config_files tests/autoreconf:tests/wrappl.in"
 
 ac_config_files="$ac_config_files tests/autoscan:tests/wrappl.in"
 
-ac_config_files="$ac_config_files tests/autoupdate"
+ac_config_files="$ac_config_files tests/autoupdate:tests/wrappl.in"
 
 ac_config_files="$ac_config_files tests/ifnames:tests/wrappl.in"
 
@@ -2253,10 +2253,10 @@ do
   "tests/atlocal" ) CONFIG_FILES="$CONFIG_FILES tests/atlocal" ;;
   "tests/autoconf" ) CONFIG_FILES="$CONFIG_FILES tests/autoconf:tests/wrapsh.in" ;;
   "tests/autoheader" ) CONFIG_FILES="$CONFIG_FILES tests/autoheader:tests/wrappl.in" ;;
-  "tests/autom4te" ) CONFIG_FILES="$CONFIG_FILES tests/autom4te" ;;
+  "tests/autom4te" ) CONFIG_FILES="$CONFIG_FILES tests/autom4te:tests/wrappl.in" ;;
   "tests/autoreconf" ) CONFIG_FILES="$CONFIG_FILES tests/autoreconf:tests/wrappl.in" ;;
   "tests/autoscan" ) CONFIG_FILES="$CONFIG_FILES tests/autoscan:tests/wrappl.in" ;;
-  "tests/autoupdate" ) CONFIG_FILES="$CONFIG_FILES tests/autoupdate" ;;
+  "tests/autoupdate" ) CONFIG_FILES="$CONFIG_FILES tests/autoupdate:tests/wrappl.in" ;;
   "tests/ifnames" ) CONFIG_FILES="$CONFIG_FILES tests/ifnames:tests/wrappl.in" ;;
   "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
   "lib/emacs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/emacs/Makefile" ;;

diff --git a/configure.ac b/configure.ac
index ed545f452e257f350d04bb93e4970c8f5e63a8e0..7ce04f004a9ff057bf69e1a7489134eee4180b8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,13 +37,13 @@ AC_CONFIG_FILES([tests/autoconf:tests/wrapsh.in],
                 [chmod +x tests/autoconf])
 AC_CONFIG_FILES([tests/autoheader:tests/wrappl.in],
                 [chmod +x tests/autoheader])
-AC_CONFIG_FILES([tests/autom4te],
+AC_CONFIG_FILES([tests/autom4te:tests/wrappl.in],
                 [chmod +x tests/autom4te])
 AC_CONFIG_FILES([tests/autoreconf:tests/wrappl.in],
                 [chmod +x tests/autoreconf])
 AC_CONFIG_FILES([tests/autoscan:tests/wrappl.in],
                 [chmod +x tests/autoscan])
-AC_CONFIG_FILES([tests/autoupdate],
+AC_CONFIG_FILES([tests/autoupdate:tests/wrappl.in],
                 [chmod +x tests/autoupdate])
 AC_CONFIG_FILES([tests/ifnames:tests/wrappl.in],
                 [chmod +x tests/ifnames])

diff --git a/lib/autoscan/headers b/lib/autoscan/headers
index aa5235955e244aab5ce13ca08c4ddb90649476a0..8442caf6eadfd5dbde221cb22a7c2aa10be13194 100644 (file)
--- a/lib/autoscan/headers
+++ b/lib/autoscan/headers
@@ -43,7 +43,7 @@ sys/wait.h    AC_HEADER_SYS_WAIT
 OS.h
 argz.h
 arpa/inet.h
-errno.h
+# errno.h is portable.
 fcntl.h
 fenv.h
 fs_info.h

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 30dde8fbd72b8734997edf23b018935f2dcad0e0..c9ee5a13d30ca1ebe31f87526bedcb7465f4b73c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -134,8 +134,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = atlocal autoconf autoheader autom4te autoreconf \
        autoscan autoupdate ifnames
 DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in atlocal.in autom4te.in \
-       autoupdate.in wrappl.in wrapsh.in
+DIST_COMMON = Makefile.am Makefile.in atlocal.in wrappl.in wrapsh.in
 all: all-am
 
 .SUFFIXES:
@@ -150,13 +149,13 @@ autoconf: $(top_builddir)/config.status wrapsh.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 autoheader: $(top_builddir)/config.status wrappl.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autom4te: $(top_builddir)/config.status autom4te.in
+autom4te: $(top_builddir)/config.status wrappl.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 autoreconf: $(top_builddir)/config.status wrappl.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 autoscan: $(top_builddir)/config.status wrappl.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoupdate: $(top_builddir)/config.status autoupdate.in
+autoupdate: $(top_builddir)/config.status wrappl.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 ifnames: $(top_builddir)/config.status wrappl.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

diff --git a/tests/autom4te.in b/tests/autom4te.in
deleted file mode 100644 (file)
index 7202d2f..0000000
--- a/tests/autom4te.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-# Running `autom4te' as if it were installed.
-
-# Be sure to use the non installed Perl modules.
-# We need no special protection for the subtools (e.g., autoheader runs
-# autoconf which runs autom4te) because by themselves, they try to use
-# subtools from the same directory (i.e., foo/autoheader will run
-# foo/autoconf etc.).
-autom4te_perllibdir=@top_srcpath@/lib
-export autom4te_perllibdir
-
-AUTOM4TE_CFG=@top_buildpath@/lib/autom4te.cfg
-export AUTOM4TE_CFG
-
-# We might need files from build (frozen files), in addition of src files.
-exec @top_buildpath@/bin/autom4te \
-     -I @top_buildpath@/lib \
-     -I @top_srcpath@/lib ${1+"$@"}

diff --git a/tests/autoupdate.in b/tests/autoupdate.in
deleted file mode 100644 (file)
index fbcb9c9..0000000
--- a/tests/autoupdate.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-# Running `autoupdate' as if it were installed.
-
-# Be sure to use the non installed Perl modules.
-# We need no special protection for the subtools (e.g., autoheader runs
-# autoconf which runs autom4te) because by themselves, they try to use
-# subtools from the same directory (i.e., foo/autoheader will run
-# foo/autoconf etc.).
-autom4te_perllibdir=@top_srcpath@/lib
-export autom4te_perllibdir
-
-# We might need files from build (frozen files), in addition of src files.
-exec @top_buildpath@/bin/autoupdate \
-     -I @top_buildpath@/lib \
-     -I @top_srcpath@/lib ${1+"$@"}

diff --git a/tests/wrappl.in b/tests/wrappl.in
index 578c2a05bb60ae8c7a23af4a2b8e3685a9748c56..1e02623bcb60bf5274acb8a367debd8f643506ef 100644 (file)
--- a/tests/wrappl.in
+++ b/tests/wrappl.in
@@ -1,4 +1,5 @@
 #! /bin/sh
+# @configure_input@
 # Running `$0' as if it were installed.
 
 me=`echo "$0" | sed -e 's,.*[\\/],,'`
@@ -11,4 +12,18 @@ me=`echo "$0" | sed -e 's,.*[\\/],,'`
 autom4te_perllibdir=@top_srcpath@/lib
 export autom4te_perllibdir
 
-exec @top_buildpath@/bin/$me ${1+"$@"}
+case $me in
+  ifnames)
+     # Does not have lib files.
+     exec @top_buildpath@/bin/$me ${1+"$@"}
+     ;;
+  autom4te)
+     AUTOM4TE_CFG=@top_buildpath@/lib/autom4te.cfg
+     export AUTOM4TE_CFG
+     ;;
+esac
+
+# We might need files from build (frozen files), in addition of src files.
+exec @top_buildpath@/bin/$me \
+     -I @top_buildpath@/lib \
+     -I @top_srcpath@/lib ${1+"$@"}