summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-03-06 23:42:30 +0000
committertruelight <truelight@openttd.org>2007-03-06 23:42:30 +0000
commit3e2fae03bdfcc672cffd342e5fadf06cff41e4e6 (patch)
treed60f44befca78a86ce7e6321e685b1296cf334f8
parentb03db3c381b672e6c0e97aaf036b940cac2feb79 (diff)
downloadopenttd-3e2fae03bdfcc672cffd342e5fadf06cff41e4e6.tar.xz
(svn r9049) -Fix [Config]: when running 'bash configure', make sure automated reconfigures run 'bash configure' too.
-rw-r--r--config.lib2
-rwxr-xr-xconfigure5
2 files changed, 6 insertions, 1 deletions
diff --git a/config.lib b/config.lib
index f3d0b6709..5eb89396e 100644
--- a/config.lib
+++ b/config.lib
@@ -275,7 +275,7 @@ save_params() {
echo "Running configure with following options:" >> $config_log
echo "" >> $config_log
- configure="$0 --ignore-extra-parameters"
+ configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters"
for p in $save_params_array; do
eval "v=\"\$$p\""
p=`echo "$p" | sed 's/_/-/g;s/\n//g;'`
diff --git a/configure b/configure
index 51a5c440e..e61b972dc 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,10 @@
#!/bin/sh
+CONFIGURE_EXECUTABLE="$_"
+# On *nix systems those two are equal when ./configure is done
+if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
+ CONFIGURE_EXECUTABLE="$CONFIGURE_EXECUTABLE $0"
+fi
# Find out where configure is (in what dir)
ROOT_DIR="`dirname $0`"
ROOT_DIR="`cd $ROOT_DIR && pwd`"