* 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.

diff --git a/ChangeLog b/ChangeLog
index 8b51131925ac5dc8f59fcb87d0bafc8d5f25ec90..1d33efc22e8bfd97975763f007394e6b78849cbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-01  Alexandre Oliva  <aoliva@redhat.com>
+
+       * 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.
+
 2000-07-26  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
        * configure.in (AM_PROG_GCJ): Moved definition...

diff --git a/ltcf-c.sh b/ltcf-c.sh
index c86e8a43696dcb6cbb2e0f6b58a5fb857b8c1ec3..5904022b9669d94cc3b3eab67242725aa1874c19 100644 (file)
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -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 0b3d5c18e5cb9bef014b1d29412bf5617811c0e4..44dcccb8651d98205d996d8b28734d3baa8f43a8 100644 (file)
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -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