Merge pull request #65 from tonycoz/compiler-find-quadmath

[metaconfig.git] / U / modified / libs.U

diff --git a/U/modified/libs.U b/U/modified/libs.U
index 4496e29..bccb6b3 100644 (file)
--- a/U/modified/libs.U
+++ b/U/modified/libs.U
@@ -1,11 +1,11 @@
 ?RCS: $Id: libs.U,v 3.0.1.6 1997/02/28 16:09:11 ram Exp $
 ?RCS:
 ?RCS: Copyright (c) 1991-1993, Raphael Manfredi
-?RCS: 
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS:
+?RCS: You may redistribute only under the terms of the Artistic License,
 ?RCS: as specified in the README file that comes with the distribution.
 ?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?RCS: $Log: libs.U,v $
@@ -34,11 +34,11 @@
 ?RCS:
 ?MAKE:libs ignore_versioned_solibs libsfound libsfiles libsdirs libspath: \
        test cat Myread Oldconfig Loc libpth package xlibpth so _a \
-       usesocks ccflags
+       usesocks sed uselongdouble
 ?MAKE: -pick add $@ %<
 ?S:libs:
 ?S:    This variable holds the additional libraries we want to use.
-?S:    It is up to the Makefile to deal with it.
+?S:    It is up to the Makefile to deal with it.  The list can be empty.
 ?S:.
 ?S:libsfound:
 ?S:    This variable holds the full pathnames of the libraries
@@ -65,7 +65,7 @@
 ?X:
 ?X: This order is chosen so that libraries  -lndir, -ldir, -lucb, -lbsd,
 ?X: -lBSD, -lPW, and -lx only get used if there are unresolved
-?X: routines at link time.  Usually, these are backwards compatability
+?X: routines at link time.  Usually, these are backwards compatibility
 ?X: libraries, and may not be as reliable as the standard c library.
 ?X:
 ?X: The -lsocket -linet -lnsl order has been reported to be necessary
@@ -80,16 +80,18 @@
 ?X: Set proper libswanted in your private Myinit.U if needed.
 ?X:
 ?X:: default ordered library list
-?X:libswanted='net socket inet nsl nm sdbm gdbm ndbm dbm malloc dl'
+?X:libswanted='net socket inet bind nsl nm sdbm gdbm ndbm dbm malloc dl'
 ?X:libswanted="$libswanted dld sun m c_s c posix cposix ndir dir ucb"
-?X:libswanted="$libswanted bsd BSD PW x iconv"
+?X:libswanted="$libswanted bsd BSD PW x"
 ?X:
 ?INIT:: default library list
 ?INIT:libswanted=''
 ?INIT:: some systems want to use only the non-versioned libso:s
 ?INIT:ignore_versioned_solibs=''
+?LINT:extern usecbacktrace
 ?LINT:extern libscheck
-?LINT:use libscheck
+?LINT:extern p
+?LINT:use uselongdouble
 : Looking for optional libraries
 echo " "
 echo "Checking for optional libraries..." >&4
@@ -100,11 +102,13 @@ esac
 case "$libswanted" in
 '') libswanted='c_s';;
 esac
-?X: libsocks has nasty naming.
+?X: libsocks has nasty naming scheme.
+?X: This does not work if somebody wants SOCKS 4.
 case "$usesocks" in
-$define)
-       libswanted="$libswanted socks5 socks5_sh"
-       ;;
+"$define") libswanted="$libswanted socks5 socks5_sh" ;;
+esac
+case "$usecbacktrace" in
+"$define") libswanted="$libswanted bfd" ;;
 esac
 libsfound=''
 libsfiles=''
@@ -117,15 +121,28 @@ for thislib in $libswanted; do
        for thisdir in $libspath; do
            xxx=''
            if $test ! -f "$xxx" -a "X$ignore_versioned_solibs" = "X"; then
-               xxx=`ls $thisdir/lib$thislib.$so.[0-9] 2>/dev/null|tail -1`
+               xxx=`ls $thisdir/lib$thislib.$so.[0-9] 2>/dev/null|sed -n '$p'`
                $test -f "$xxx" && eval $libscheck
                $test -f "$xxx" && libstyle=shared
+               xxx=`ls $thisdir/lib$thislib.[0-9].$so 2>/dev/null|sed -n '$p'`
+               $test -f "$xxx" && eval $libscheck
+               $test -f "$xxx" && libstyle=shared
+           fi
+           if test ! -f "$xxx"; then
+               xxx=$thisdir/lib$thislib.$so$_a
+               $test -f "$xxx" && eval $libscheck
+               $test -f "$xxx" && libstyle="import"
+           fi
+           if test ! -f "$xxx"; then
+               xxx=$thisdir/$thislib.$so$_a
+               $test -f "$xxx" && eval $libscheck
+               $test -f "$xxx" && libstyle="import"
            fi
            if test ! -f "$xxx"; then
                xxx=$thisdir/lib$thislib.$so
                $test -f "$xxx" && eval $libscheck
                $test -f "$xxx" && libstyle=shared
-           fi  
+           fi
            if test ! -f "$xxx"; then
                xxx=$thisdir/lib$thislib$_a
                $test -f "$xxx" && eval $libscheck
@@ -140,6 +157,7 @@ for thislib in $libswanted; do
                xxx=$thisdir/lib${thislib}_s$_a
                $test -f "$xxx" && eval $libscheck
                $test -f "$xxx" && libstyle=static
+               $test -f "$xxx" && thislib=${thislib}_s
            fi
            if test ! -f "$xxx"; then
                xxx=$thisdir/Slib$thislib$_a
@@ -155,18 +173,18 @@ for thislib in $libswanted; do
                case " $dflt " in
                *"-l$thislib "*);;
                *) dflt="$dflt -l$thislib"
-                   libsfound="$libsfound $xxx"
-                   yyy=`basename $xxx`
-                   libsfiles="$libsfiles $yyy"
-                   yyy=`echo $xxx|sed "s@/$yyy\\$@@"`
-                   case " $libsdirs " in
-                   *" $yyy "*) ;;
-                   *) libsdirs="$libsdirs $yyy" ;;
-                   esac
+                  libsfound="$libsfound $xxx"
+                  yyy=`basename $xxx`
+                  libsfiles="$libsfiles $yyy"
+                  yyy=`echo $xxx|$sed -e "s%/$yyy\\$%%"`
+                  case " $libsdirs " in
+                  *" $yyy "*) ;;
+                  *) libsdirs="$libsdirs $yyy" ;;
+                  esac
                   ;;
                esac
                break
-           fi  
+           fi
        done
        if $test ! -f "$xxx"; then
            echo "No -l$thislib."