From 99ffe40fe73240b249996d42ab0a2ba31e154e2d Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Fri, 20 Apr 2001 09:26:56 +0000
Subject: [PATCH] ltconfig, [...]: Upgraded to libtool 1.4a 1.641.2.228.

* ltconfig, ltmain.sh, ltcf-cxx.sh: Upgraded to libtool 1.4a
1.641.2.228.

From-SVN: r41452
---
 ChangeLog   |  5 +++++
 ltcf-cxx.sh | 18 +++++++++++-------
 ltconfig    |  2 +-
 ltmain.sh   |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b94ded234a4..6e72b6f7abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltconfig, ltmain.sh, ltcf-cxx.sh: Upgraded to libtool 1.4a
+	1.641.2.228.
+
 2001-04-13  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	* Makefile.in (STAGE1_CFLAGS): Pass down.
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index aefc206f9e8..e3489146422 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -243,12 +243,14 @@ case $host_os in
     ld_shlibs=yes
     ;;
   hpux*)
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
+    if test $with_gnu_ld = no; then
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      export_dynamic_flag_spec='${wl}-E'
+    fi
     hardcode_direct=yes
     hardcode_minus_L=yes # Not in the search PATH, but as the default
 			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
 
     case $cc_basename in
       CC)
@@ -272,10 +274,12 @@ case $host_os in
         ;;
       *)
         if test $with_gcc = yes; then
-	  case "$host_os" in
-	  hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-	  *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
-	  esac
+	  if test $with_gnu_ld = no; then
+	    case "$host_os" in
+	    hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+	    *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
+	    esac
+	  fi
 	else
 	  # FIXME: insert proper C++ library support
           ld_shlibs=no
diff --git a/ltconfig b/ltconfig
index aad0a2b148a..29180261654 100755
--- a/ltconfig
+++ b/ltconfig
@@ -182,7 +182,7 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
 PROGRAM=ltconfig
 PACKAGE=libtool
 VERSION=1.4a
-TIMESTAMP=" (1.641.2.226 2001/04/12 02:39:36)"
+TIMESTAMP=" (1.641.2.228 2001/04/20 08:53:18)"
 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 d8f53859067..daaf6bb5e9e 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -56,7 +56,7 @@ modename="$progname"
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 VERSION=1.4a
-TIMESTAMP=" (1.641.2.226 2001/04/12 02:39:36)"
+TIMESTAMP=" (1.641.2.228 2001/04/20 08:53:18)"
 
 default_mode=
 help="Try \`$progname --help' for more information."