w3m

commit 51e6f311885d4dd53f92d6814158aab33a74fa15
parent 5fbb78b7c69561eec3992336eb0691e1646f1dab
Author: ukai <ukai>
Date:   Sun,  3 Feb 2002 06:23:37 +0000

[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
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
configure
 | 
18
+++---------------

2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/configure b/configure
@@ -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