* tests/wrapsh.as, tests/wrappl.as: Merge into...

* tests/wrapper.as: this.
* tests/Makefile.am, configure.ac: Adjust.

diff --git a/ChangeLog b/ChangeLog
index 307ac0b4d42f94ecee266e51349993553d596081..0810d9bd2755195dc7f95e159ed7f0b8d78aeee9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2002-07-17  Akim Demaille  <akim@epita.fr>
+
+       * tests/wrapsh.as, tests/wrappl.as: Merge into...
+       * tests/wrapper.as: this.
+       * tests/Makefile.am, configure.ac: Adjust.
+
 2002-07-17  Mark D. Roth  <roth@feep.net>
- 
+
        * configure.ac: Add --enable-site-macro-dir option.
        * bin/Makefile.am: Expand @SITE_MACRO_DIR@.
        * bin/autom4te.in: Add --prepend-include, --include-envvar, and
@@ -679,7 +685,6 @@
        * bin/autoreconf.in, bin/autoscan.in, bin/autoupdate.in,
        * bin/ifnames.in: Copyright update.
 
-
 2002-03-08  Akim Demaille  <akim@epita.fr>
 
        * doc/autoconf.texi (Invoking autom4te): New.

diff --git a/configure.ac b/configure.ac
index e38078500f4e406400dc194d6a102405cde73ef2..4cc10db460de49ae91baa0481c3dda0ad1104b17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,19 +41,19 @@ AC_SUBST([SITE_MACRO_DIR], "${enable_site_macro_dir}")
 # Initialize the test suite and build position independent wrappers.
 AC_CONFIG_TESTDIR([tests])
 AC_CONFIG_FILES([tests/Makefile tests/atlocal])
-AC_CONFIG_FILES([tests/autoconf:tests/wrapsh.in],
+AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
                 [chmod +x tests/autoconf])
-AC_CONFIG_FILES([tests/autoheader:tests/wrappl.in],
+AC_CONFIG_FILES([tests/autoheader:tests/wrapper.in],
                 [chmod +x tests/autoheader])
-AC_CONFIG_FILES([tests/autom4te:tests/wrappl.in],
+AC_CONFIG_FILES([tests/autom4te:tests/wrapper.in],
                 [chmod +x tests/autom4te])
-AC_CONFIG_FILES([tests/autoreconf:tests/wrappl.in],
+AC_CONFIG_FILES([tests/autoreconf:tests/wrapper.in],
                 [chmod +x tests/autoreconf])
-AC_CONFIG_FILES([tests/autoscan:tests/wrappl.in],
+AC_CONFIG_FILES([tests/autoscan:tests/wrapper.in],
                 [chmod +x tests/autoscan])
-AC_CONFIG_FILES([tests/autoupdate:tests/wrappl.in],
+AC_CONFIG_FILES([tests/autoupdate:tests/wrapper.in],
                 [chmod +x tests/autoupdate])
-AC_CONFIG_FILES([tests/ifnames:tests/wrappl.in],
+AC_CONFIG_FILES([tests/ifnames:tests/wrapper.in],
                 [chmod +x tests/ifnames])
 AC_PATH_PROG(EXPR, expr)
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab2870c0463213aa5a4d3eb65f2c25becd33a258..e5a1ed03ba0603a6d8f90bfda31817dab76ea95e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,7 @@
 # We don't actually distribute the testsuite, since one only
 # needs m4 to build it, m4 being required anyway to install Autoconf.
 EXTRA_DIST = $(TESTSUITE_AT) atspecific.m4 mktests.sh \
-             atlocal.in package.m4 wrappl.as wrapsh.as
+             atlocal.in package.m4 wrapper.as
 
 # Running the uninstalled scripts.
 check_SCRIPTS = autoconf autoheader autoreconf autom4te autoscan autoupdate ifnames
@@ -52,11 +52,9 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## Wrappers.  ##
 ## ---------- ##
 
-$(srcdir)/wrapsh.in: $(srcdir)/wrapsh.as
-       ./autom4te --language=M4sh $(srcdir)/wrapsh.as -o $@
+$(srcdir)/wrapper.in: $(srcdir)/wrapper.as
+       ./autom4te --language=M4sh $(srcdir)/wrapper.as -o $@
 
-$(srcdir)/wrappl.in: $(srcdir)/wrappl.as
-       ./autom4te --language=M4sh $(srcdir)/wrappl.as -o $@
 
 
 ## ------------ ##

diff --git a/tests/wrappl.as b/tests/wrapper.as
similarity index 71%
rename from tests/wrappl.as
rename to tests/wrapper.as
index 9b85f8e2d08f1aa70793c0afa7de5627037beeda..ff3d9b3eb22197786a75ce9d192391f8d6435a9b 100644 (file)
--- a/tests/wrappl.as
+++ b/tests/wrapper.as
@@ -14,8 +14,11 @@ case $as_me in
      # Does not have lib files.
      exec @abs_top_builddir@/bin/$as_me ${1+"$@"}
      ;;
+  *)
+     # We might need files from the build tree (frozen files), in
+     # addition of src files.
+     exec @abs_top_builddir@/bin/$as_me \
+         -B @abs_top_builddir@/lib \
+         -B @abs_top_srcdir@/lib ${1+"$@"}
 esac
-# We might need files from build (frozen files), in addition of src files.
-exec @abs_top_builddir@/bin/$as_me \
-       -I @abs_top_builddir@/lib \
-       -I @abs_top_srcdir@/lib ${1+"$@"}
+exit 1

diff --git a/tests/wrappl.in b/tests/wrapper.in
old mode 100644 (file)
new mode 100755 (executable)
similarity index 85%
rename from tests/wrappl.in
rename to tests/wrapper.in
index dfa7cbf..e285943
--- a/tests/wrappl.in
+++ b/tests/wrapper.in
@@ -78,23 +78,23 @@ echo X/"$0" |
 # @configure_input@
 # Running `$0' as if it were installed.
 
-# Be sure to use the non installed Perl modules.
+AUTOCONF=@abs_top_builddir@/bin/autoconf
+AUTOHEADER=@abs_top_builddir@/bin/autoheader
+AUTOM4TE=@abs_top_builddir@/bin/autom4te
+AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
 autom4te_perllibdir=@abs_top_srcdir@/lib
-export autom4te_perllibdir
+export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir
 
 case $as_me in
   ifnames)
      # Does not have lib files.
      exec @abs_top_builddir@/bin/$as_me ${1+"$@"}
      ;;
-
-  autom4te)
-     AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
-     export AUTOM4TE_CFG
-     ;;
-
+  *)
+     # We might need files from the build tree (frozen files), in
+     # addition of src files.
+     exec @abs_top_builddir@/bin/$as_me \
+         -B @abs_top_builddir@/lib \
+         -B @abs_top_srcdir@/lib ${1+"$@"}
 esac
-# We might need files from build (frozen files), in addition of src files.
-exec @abs_top_builddir@/bin/$as_me \
-       -I @abs_top_builddir@/lib \
-       -I @abs_top_srcdir@/lib ${1+"$@"}
+exit 1

diff --git a/tests/wrapsh.as b/tests/wrapsh.as
deleted file mode 100644 (file)
index 3e4e2da..0000000
--- a/tests/wrapsh.as
+++ /dev/null
@@ -1,10 +0,0 @@
-AS_INIT[]dnl                                         -*- shell-script -*-
-# @configure_input@
-# Running `$0' as if it were installed.
-AUTOCONF=@abs_top_builddir@/bin/autoconf
-AUTOHEADER=@abs_top_builddir@/bin/autoheader
-AUTOM4TE=@abs_top_builddir@/bin/autom4te
-AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
-autom4te_perllibdir=@abs_top_srcdir@/lib
-export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir
-exec @abs_top_builddir@/bin/$as_me --include @abs_top_builddir@/lib ${1+"$@"}

diff --git a/tests/wrapsh.in b/tests/wrapsh.in
deleted file mode 100644 (file)
index bb09a3b..0000000
--- a/tests/wrapsh.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# NLS nuisances.
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
-    { $as_unset LANG || test "${LANG+set}" != set; } ||
-      { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
-      { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
-      { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
-      { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
-      { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
-      { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
-      { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
-      { LC_MESSAGES=C; export LC_MESSAGES; }
-
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)$' \| \
-        .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-         /^X\/\(\/\/\)$/{ s//\1/; q; }
-         /^X\/\(\/\).*/{ s//\1/; q; }
-         s/.*/./; q'`
-
-
-# @configure_input@
-# Running `$0' as if it were installed.
-exec @abs_top_builddir@/bin/$as_me --prepend-include @abs_top_builddir@/lib ${1+"$@"}