aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2001-12-20 12:32:19 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2001-12-20 12:32:19 +0000
commitd88bf29a4732aeeca926462c156407f133b7dd8e (patch)
tree47765aef04fc18f54588c74785126443d017e860
parentchanged for w3m-0.2.3 (diff)
downloadw3m-d88bf29a4732aeeca926462c156407f133b7dd8e.tar.gz
w3m-d88bf29a4732aeeca926462c156407f133b7dd8e.zip
[w3m-dev 02683]
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
-rw-r--r--ChangeLog9
-rwxr-xr-xconfigure9
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 741f77b..3ac5ed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-20 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 02683]
+ * configure (def_param): fix wrong behavior unless variable initialized
+ * configure (def_param): fix unnecessary eval
+ * configure (ask_choice): ditto
+
2001-12-20 Dai Sato <satodai@dog.intcul.tohoku.ac.jp>
* w3mhelp-*.html, doc/README, doc-jp/README:
@@ -1345,4 +1352,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.147 2001/12/20 11:11:49 inu Exp $
+$Id: ChangeLog,v 1.148 2001/12/20 12:32:19 ukai Exp $
diff --git a/configure b/configure
index 2506b61..b3c9ff4 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: configure,v 1.40 2001/12/20 04:03:24 ukai Exp $
+# $Id: configure,v 1.41 2001/12/20 12:32:19 ukai Exp $
# Configuration.
#
@@ -234,7 +234,8 @@ def_param() {
eval "fvar=\$$flag"
dflt=$2
if [ -z "$fvar" ]; then
- eval "fvar=$dflt"
+ fvar=$dflt
+ eval $flag='$fvar'
fi
def=`echo $flag | tr '[a-z]' '[A-Z]'`
if [ "$fvar" = "y" ]; then
@@ -242,7 +243,7 @@ def_param() {
else
eval "def_$flag='#undef $def'"
fi
- eval "echo $flag=$fvar >> config.param"
+ echo "$flag=$fvar" >> config.param
}
#
@@ -330,7 +331,7 @@ ask_choice() {
shift
eval "def_$var='#define $def $v'"
eval "$var=$v"
- eval "echo $var=$v >> config.param";
+ echo "$var=$v" >> config.param
echo " $def=$v"
break
;;