summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-01-07 13:13:01 +0000
committertruelight <truelight@openttd.org>2007-01-07 13:13:01 +0000
commita9740d850e95fe52b410e4518e3dc850bbf073f1 (patch)
treee240fcd75aee641f98a96904999d3390dbf7c855
parentb1aea88bf0ae229ab7535749f983583e2c95a6fa (diff)
downloadopenttd-a9740d850e95fe52b410e4518e3dc850bbf073f1.tar.xz
(svn r7961) [Configure] -Fix: "" in config params didn't survive --reconfig. They should now.
-rw-r--r--config.lib4
-rwxr-xr-xconfigure5
2 files changed, 5 insertions, 4 deletions
diff --git a/config.lib b/config.lib
index 0dfafc82b..4b973fa80 100644
--- a/config.lib
+++ b/config.lib
@@ -257,10 +257,10 @@ save_params() {
configure="$0 --ignore-extra-parameters"
for p in $save_params_array; do
- eval "v=\$$p"
+ eval "v=\"\$$p\""
p=`echo "$p" | sed 's/_/-/g;s/\n//g;'`
# Only save those params that aren't empty
- configure="$configure --$p=$v"
+ configure="$configure --$p=\"$v\""
done
echo "$configure" >> $config_log
diff --git a/configure b/configure
index ecd13e270..f28be4a46 100755
--- a/configure
+++ b/configure
@@ -25,8 +25,9 @@ if [ "$1" = "--reconfig" ]; then
exit 1
fi
# Make sure we don't lock config.cache
- configure=`cat config.cache`
- $configure
+ cat config.cache > cache.tmp
+ sh cache.tmp
+ rm -f cache.tmp
exit $?
fi