diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | configure | 17 |
2 files changed, 15 insertions, 9 deletions
@@ -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 @@ -6710,4 +6715,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.704 2003/01/22 16:16:18 ukai Exp $ +$Id: ChangeLog,v 1.705 2003/01/22 16:36:11 ukai Exp $ @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure,v 1.94 2003/01/22 15:53:12 ukai Exp $ +# $Id: configure,v 1.95 2003/01/22 16:36:11 ukai Exp $ # Configuration. # @@ -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 |