From: Akim Demaille <akim@epita.fr>
Date: Thu, 27 Sep 2001 15:06:14 +0000 (+0000)
Subject: Position independent wrapper.
X-Git-Tag: BISON-1_29c~12
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/02cbcfc5773a6396d591eee675cdba4e7e1f2614

Position independent wrapper.
* tests/bison: Remove.
* tests/bison.in: New.
* configure.in: Adjust.
---

diff --git a/ChangeLog b/ChangeLog
index d27cbe4f..be90bb29 100644
--- 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 a98b28f2..5f47f47a 100644
--- 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 0f854ecb..80757a3c 100755
--- 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 439b7ecc..d1fffe7b 100644
--- 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 de3fcf4b..fa624628 100644
--- 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 c172fb04..dc70d89b 100644
--- 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
index 86ecafa3..00000000
--- 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 1b5b14fe..4adaefa6 100644
--- 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+"$@"}