w3m

commit f666fbf536d1f2a6fc4c2288eb8d11d091808576
parent cfa0d9c8662f2bb61df81a6c83d3d84520dfaea4
Author: ukai <ukai>
Date:   Wed, 22 Jan 2003 16:36:11 +0000

[w3m-dev 03678] Re: config.param is clear when configure -help
* configure: don't override config.param
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:
M
ChangeLog
 | 
5
+++++
M
configure
 | 
15
++++++++-------

2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-23  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 03678] Re: config.param is clear when configure -help
+	* configure: don't override config.param
+
 2003-01-23  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03677] view source, edit source
diff --git a/configure b/configure
@@ -22,13 +22,6 @@ sysversion3=`echo $sysversion | awk -F. '{print $3}'`
 
 echo $sysname $sysversion1 $sysversion2 $sysversion3 /$platform at $host
 
-if [ -f config.param ] ; then
-	confhost=`awk 'NR==1{print $4}' config.param`
-	if [ "$confhost" = "$host" ] ; then
-          . ./config.param
-	fi
-fi
-
 # parameters:
 
 prefix=/usr/local
@@ -38,6 +31,14 @@ gc_includedir=
 gc_libdir=
 mimetypes=
 
+# local overrides
+if [ -f config.param ] ; then
+	confhost=`awk 'NR==1{print $4}' config.param`
+	if [ "$confhost" = "$host" ] ; then
+          . ./config.param
+	fi
+fi
+
 all_yes=0
 while [ $# -gt 0 ]
 do