diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rwxr-xr-x | configure | 20 |
2 files changed, 13 insertions, 17 deletions
@@ -1,3 +1,11 @@ +2002-02-03 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> + + * [w3m-dev 02970] multiple -lnsl -lsocket + * configure: merge bsdlib and extlib detection, use extlib only + add ldflags to extlib + (SYS_LIBRARIES): remove extlib + (LOCAL_LIBRARIES): exlib only + 2002-02-03 TSUCHIYA Masatoshi <tsuchiya@pine.kuee.kyoto-u.ac.jp> * [w3m-dev 02964] Print data of forms when halfdump option is set @@ -2721,4 +2729,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.292 2002/02/03 06:12:41 ukai Exp $ +$Id: ChangeLog,v 1.293 2002/02/03 06:23:37 ukai Exp $ @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure,v 1.59 2002/01/31 17:54:49 ukai Exp $ +# $Id: configure,v 1.60 2002/02/03 06:23:37 ukai Exp $ # Configuration. # @@ -946,19 +946,6 @@ do for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib do if [ -f $tlibdir/lib$lib.a -o -f $tlibdir/lib$lib.$so_ext ] ; then - bsdlib="$bsdlib -l$lib" - break - fi - done -done -extlib='' - -searchlibs="socket nsl" -for lib in $searchlibs -do - for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib - do - if [ -f $tlibdir/lib$lib.a -o -f $tlibdir/lib$lib.$so_ext ] ; then extlib="$extlib -l$lib" break fi @@ -970,6 +957,7 @@ fi if [ -n "$extlib" ]; then echo "additional library found: $extlib" fi +extlib="$extlib $ldflags" ## Search zlib zlib= @@ -2042,8 +2030,8 @@ LIB_DIR = $libdir ETC_DIR = $sysconfdir RC_DIR = ~/.w3m HELP_FILE = $helpfile -SYS_LIBRARIES = $gpmlib $extlib $termlib $ssllib $v6lib -LOCAL_LIBRARIES = $bsdlib $ldflags +SYS_LIBRARIES = $gpmlib $termlib $ssllib $v6lib +LOCAL_LIBRARIES = $extlib CC = $cc MYCFLAGS = $cflags $bsdinclude $sslinclude GCCFLAGS = $cflags -I./\$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS |