autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Wrapper.as


From: Akim Demaille
Subject: Wrapper.as
Date: 17 Jul 2002 11:54:09 +0200
User-agent: Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Honest Recruiter)

The --prepend-include patch was changing a generated file.  We also
said we wanted a single wrapper for all.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * tests/wrapsh.as, tests/wrappl.as: Merge into...
        * tests/wrapper.as: this.
        * tests/Makefile.am, configure.ac: Adjust.

Index: configure.ac
===================================================================
RCS file: /cvsroot/autoconf/autoconf/configure.ac,v
retrieving revision 1.39
diff -u -u -r1.39 configure.ac
--- configure.ac 17 Jul 2002 08:30:42 -0000 1.39
+++ configure.ac 17 Jul 2002 09:46:08 -0000
@@ -41,19 +41,19 @@
 # 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)
 
Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/Makefile.am,v
retrieving revision 1.81
diff -u -u -r1.81 Makefile.am
--- tests/Makefile.am 12 Apr 2002 09:56:10 -0000 1.81
+++ tests/Makefile.am 17 Jul 2002 09:50:11 -0000
@@ -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 @@
 ## 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 $@
 
 
 ## ------------ ##
Index: tests/wrapper.as
===================================================================
RCS file: tests/wrapper.as
diff -N tests/wrapper.as
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/wrapper.as 17 Jul 2002 09:50:11 -0000
@@ -0,0 +1,23 @@
+AS_INIT[]dnl                                         -*- shell-script -*-
+# @configure_input@
+# Running `$0' as if it were installed.
+
address@hidden@/bin/autoconf
address@hidden@/bin/autoheader
address@hidden@/bin/autom4te
address@hidden@/lib/autom4te.cfg
address@hidden@/lib
+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+"$@"}
+     ;;
+  *)
+     # 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
Index: tests/wrappl.as
===================================================================
RCS file: tests/wrappl.as
diff -N tests/wrappl.as
--- tests/wrappl.as 15 Jun 2002 07:48:16 -0000 1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-AS_INIT[]dnl                                         -*- shell-script -*-
-# @configure_input@
-# Running `$0' as if it were installed.
-
address@hidden@/bin/autoconf
address@hidden@/bin/autoheader
address@hidden@/bin/autom4te
address@hidden@/lib/autom4te.cfg
address@hidden@/lib
-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+"$@"}
-     ;;
-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+"$@"}
Index: tests/wrapsh.as
===================================================================
RCS file: tests/wrapsh.as
diff -N tests/wrapsh.as
--- tests/wrapsh.as 15 Jun 2002 07:47:42 -0000 1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-AS_INIT[]dnl                                         -*- shell-script -*-
-# @configure_input@
-# Running `$0' as if it were installed.
address@hidden@/bin/autoconf
address@hidden@/bin/autoheader
address@hidden@/bin/autom4te
address@hidden@/lib/autom4te.cfg
address@hidden@/lib
-export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir
-exec @abs_top_builddir@/bin/$as_me --include @abs_top_builddir@/lib ${1+"$@"}



reply via email to

[Prev in Thread] Current Thread [Next in Thread]