* ltconfig, ltmain.sh: Update from libtool multi-language branch.

* ltcf-c.sh (need_lc): Fix test message.  Set wl for archive_cmds.
(ac_cv_prog_cc_pic): Don't print `cached' without `checking'.
* ltcf-cxx.sh (need_lc): Set based on postdeps.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35405 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 19 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index 155f5dd8a41..918883d9521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-08-01  Alexandre Oliva  <aoliva@redhat.com>
 
+	* ltconfig, ltmain.sh: Update from libtool multi-language branch.
+	* ltcf-c.sh (need_lc): Fix test message.  Set wl for archive_cmds.
+	(ac_cv_prog_cc_pic): Don't print `cached' without `checking'.
+	* ltcf-cxx.sh (need_lc): Set based on postdeps.
+
 	* configure.in (qCXX_FOR_TARGET): Use echo instead of expr.
 
 2000-07-31  Alexandre Oliva  <aoliva@redhat.com>
diff --git a/ltcf-c.sh b/ltcf-c.sh
index ba1f70e84bb..73813a82ec1 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -1,6 +1,6 @@
 #### This script is meant to be sourced by ltconfig.
 
-# $Id: ltcf-c.sh,v 1.1.2.9 2000/07/24 05:28:14 oliva Exp $
+# $Id: ltcf-c.sh,v 1.1 2000/07/28 18:04:21 bkoz Exp $
 
 # ltcf-c.sh - Create a C compiler specific configuration
 #
@@ -520,7 +520,7 @@ fi
 
 ## Compiler Characteristics: PIC flags, static flags, etc
 if test "X${ac_cv_prog_cc_pic+set}" = Xset; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  :
 else
   ac_cv_prog_cc_pic=
   ac_cv_prog_cc_shlib=
@@ -653,27 +653,28 @@ if test "$enable_shared" = yes && test "$with_gcc" = yes; then
     # Test whether the compiler implicitly links with -lc since on some
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
-    echo $ac_n "checking whether -lc is implicitly linked in... $ac_c" 1>&6
+    echo $ac_n "checking whether -lc should be explicitly linked in... $ac_c" 1>&6
     if eval "test \"`echo '$''{'ac_cv_archive_cmds_needs_lc'+set}'`\" = set"; then
       echo $ac_n "(cached) $ac_c" 1>&6
       need_lc=$ac_cv_archive_cmds_needs_lc
     else
       $rm conftest*
       echo "static int dummy;" > conftest.$ac_ext
-      if { (eval echo $progname:@LINENO@: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
+      if { (eval echo ltcf-c.sh:need_lc: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
 	# Append any warnings to the config.log.
 	cat conftest.err 1>&5
 	soname=conftest
 	lib=conftest
 	libobjs=conftest.o
 	deplibs=
+	wl=$ac_cv_prog_cc_wl
 	compiler_flags=-v
 	linker_flags=-v
 	verstring=
 	output_objdir=.
 	libname=conftest
 	allow_undefined_flag=
-	if { (eval echo $progname:@LINENO@: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then
+	if { (eval echo ltcf-c.sh:need_lc: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then
 	  need_lc=no
 	fi
       else
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index cfbe5caaa24..5b28674f3f8 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -1,6 +1,6 @@
 #### This script is meant to be sourced by ltconfig.
 
-# $Id: ltcf-cxx.sh,v 1.1.2.18 2000/07/24 06:10:27 oliva Exp $
+# $Id: ltcf-cxx.sh,v 1.1 2000/07/28 18:04:21 bkoz Exp $
 
 # ltcf-cxx.sh - Create a C++ compiler specific configuration
 #
@@ -874,47 +874,7 @@ fi
 
 $rm -f confest.$objext
 
-need_lc=yes
-if test "$enable_shared" = yes && test "$with_gcc" = yes; then
-  case "$archive_cmds" in
-  *'~'*)
-    # FIXME: we may have to deal with multi-command sequences.
-    ;;
-  '$CC '*)
-    # Test whether the compiler implicitly links with -lc since on some
-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-    # to ld, don't add -lc before -lgcc.
-    echo $ac_n "checking whether -lc is implicitly linked in... $ac_c" 1>&6
-    if eval "test \"`echo '$''{'ac_cv_cxx_archive_cmds_needs_lc'+set}'`\" = set"; then
-      echo $ac_n "(cached) $ac_c" 1>&6
-      need_lc=$ac_cv_cxx_archive_cmds_needs_lc
-    else
-      $rm conftest*
-      echo "static int dummy;" > conftest.$ac_ext
-      if { (eval echo $progname:@LINENO@: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
-	# Append any warnings to the config.log.
-	cat conftest.err 1>&5
-
-	soname=conftest
-	lib=conftest
-	libobjs=conftest.o
-	deplibs=
-	compiler_flags=-v
-	linker_flags=-v
-	verstring=
-	output_objdir=.
-	libname=conftest
-	allow_undefined_flag=
-	if { (eval echo $progname:@LINENO@: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then
-	  need_lc=no
-	fi
-      else
-	cat conftest.err 1>&5
-      fi
-    fi
-    $rm conftest*
-    echo "$ac_t$need_lc" 1>&6
-    ;;
-  esac
-fi
-ac_cv_cxx_archive_cmds_needs_lc=$need_lc
+case " $postdeps " in
+*" -lc "*) need_lc=no ;;
+*) need_lc=yes ;;
+esac
diff --git a/ltconfig b/ltconfig
index da18cc917c7..a352e82e1ff 100755
--- a/ltconfig
+++ b/ltconfig
@@ -181,7 +181,7 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
 PROGRAM=ltconfig
 PACKAGE=libtool
 VERSION=1.4a
-TIMESTAMP=" (1.641.2.74 2000/07/26 04:31:03)"
+TIMESTAMP=" (1.641.2.77 2000/08/01 04:25:15)"
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 rm="rm -f"
diff --git a/ltmain.sh b/ltmain.sh
index 81108af1cb0..056c1dae571 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -55,7 +55,7 @@ modename="$progname"
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 VERSION=1.4a
-TIMESTAMP=" (1.641.2.74 2000/07/26 04:31:03)"
+TIMESTAMP=" (1.641.2.77 2000/08/01 04:25:15)"
 
 default_mode=
 help="Try \`$progname --help' for more information."
@@ -4023,7 +4023,7 @@ relink_command=\"$relink_command\""
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       expr "X$nonopt" : "X.*shtool.*" > /dev/null; then
+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
       # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case "$arg" in