Position independent wrapper.

* tests/bison: Remove.
* tests/bison.in: New.
* configure.in: Adjust.

diff --git a/ChangeLog b/ChangeLog
index d27cbe4f654407d25caa5fdbefa68822ff6751cb..be90bb297b935b12585144f59f6451b70c44c57c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-27  Akim Demaille  <akim@epita.fr>
+
+       Position independent wrapper.
+
+       * tests/bison: Remove.
+       * tests/bison.in: New.
+       * configure.in: Adjust.
+
 2001-09-27  Paul Eggert  <eggert@twinsun.com>
 
        Port quotearg fixes from tar 1.13.24.

diff --git a/Makefile.in b/Makefile.in
index a98b28f2837a0478006445c01e2c4c475194d2f1..5f47f47acb52d7bc2e4ee7f496e06e81b84f8a60 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -292,7 +292,7 @@ distdir: $(DISTFILES)
        fi
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
        mkdir $(distdir)
-       $(mkinstalldirs) $(distdir)/intl $(distdir)/po
+       $(mkinstalldirs) $(distdir)/intl $(distdir)/po $(distdir)/tests
        @for file in $(DISTFILES); do \
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

diff --git a/configure b/configure
index 0f854ecbf1addf80b909227a9b27859fc07c1ad3..80757a3c200787c7fe34a7bf8ce1c9977061a0e9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1407,6 +1407,8 @@ if test -f $srcdir/tests/atlocal.in; then
 
 fi
 
+ac_config_files="$ac_config_files tests/bison"
+
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8913,6 +8915,7 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "tests/atlocal" ) CONFIG_FILES="$CONFIG_FILES tests/atlocal" ;;
+  "tests/bison" ) CONFIG_FILES="$CONFIG_FILES tests/bison" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
   "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
@@ -9267,6 +9270,10 @@ s,@INSTALL@,$ac_INSTALL,;t t
     rm -f $tmp/out
   fi
 
+  # Run the commands associated with the file.
+  case $ac_file in
+    tests/bison ) chmod +x tests/bison ;;
+  esac
 done
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF

diff --git a/configure.in b/configure.in
index 439b7ecc8abe7ddbc657f300adc1657804310216..d1fffe7bf3423b4778e1f8f60ac8f29c2445f0ae 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -26,6 +26,7 @@ AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 
 # Checks for programs.
 AC_PROG_CC

diff --git a/tests/Makefile.am b/tests/Makefile.am
index de3fcf4b2dcbcb64eead783ab810eaa4eceb5805..fa624628014b9345926e01fc86c0df75cf995737 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,7 @@
 
 EXTRA_DIST = atlocal.in bison $(TESTSUITE_AT) testsuite
 
-DISTCLEANFILES       = atconfig atlocal package.m4
+DISTCLEANFILES       = atconfig atlocal bison package.m4
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
 TESTSUITE_AT = \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c172fb04d12c41b6502f67187301418127a1614d..dc70d89b4ba97e2bc3f602512efbd1228750cf35 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -98,7 +98,7 @@ install_sh = @install_sh@
 
 EXTRA_DIST = atlocal.in bison $(TESTSUITE_AT) testsuite
 
-DISTCLEANFILES = atconfig atlocal package.m4
+DISTCLEANFILES = atconfig atlocal bison package.m4
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
 TESTSUITE_AT = \
@@ -112,9 +112,9 @@ AUTOTEST = $(AUTOM4TE) --language=autotest
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = bison
 DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in bison.in
 all: all-am
 
 .SUFFIXES:
@@ -125,6 +125,8 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+bison: $(top_builddir)/config.status bison.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 uninstall-info-am:
 tags: TAGS
 TAGS:

diff --git a/tests/bison b/tests/bison
deleted file mode 100755 (executable)
index 86ecafa..0000000
--- a/tests/bison
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-# Wrapper around a non installed bison to make it work as an installed one.
-. ./atconfig
-
-# We want to use the files shipped with Bison.
-BISON_SIMPLE=$top_srcdir/src/bison.simple
-export BISON_SIMPLE
-BISON_HAIRY=$top_srcdir/src/bison.hairy
-export BISON_HAIRY
-
-exec $top_builddir/src/bison ${1+"$@"}

diff --git a/tests/bison.in b/tests/bison.in
index 1b5b14feb1ed7cd92edb14ad20dee1c8f5fbd708..4adaefa684e33d03555bed250772c3c057a3e73f 100644 (file)
--- a/tests/bison.in
+++ b/tests/bison.in
@@ -8,4 +8,4 @@ export BISON_SIMPLE
 BISON_HAIRY='@top_srcpath@/src/bison.hairy'
 export BISON_HAIRY
 
-exec '@top_builddir@/src/bison' ${1+"$@"}
+exec '@top_buildpath@/src/bison' ${1+"$@"}