Patch to libtool-1.2b to make --disable-static

Sun Sep 20 18:21:46 1998  Owen Taylor  <otaylor@redhat.com>

	* ltconfig.sh: Patch to libtool-1.2b to make --disable-static

8 files changed, 44 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e4296dc8f..3fd338790 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 20 18:21:46 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* ltconfig.sh: Patch to libtool-1.2b to make --disable-static
+	work.
+
 Sun Sep 20 09:52:39 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* HACKING: indent other than GNU indent should be OK
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e4296dc8f..3fd338790 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Sep 20 18:21:46 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* ltconfig.sh: Patch to libtool-1.2b to make --disable-static
+	work.
+
 Sun Sep 20 09:52:39 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* HACKING: indent other than GNU indent should be OK
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e4296dc8f..3fd338790 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Sep 20 18:21:46 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* ltconfig.sh: Patch to libtool-1.2b to make --disable-static
+	work.
+
 Sun Sep 20 09:52:39 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* HACKING: indent other than GNU indent should be OK
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e4296dc8f..3fd338790 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Sep 20 18:21:46 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* ltconfig.sh: Patch to libtool-1.2b to make --disable-static
+	work.
+
 Sun Sep 20 09:52:39 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* HACKING: indent other than GNU indent should be OK
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e4296dc8f..3fd338790 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Sep 20 18:21:46 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* ltconfig.sh: Patch to libtool-1.2b to make --disable-static
+	work.
+
 Sun Sep 20 09:52:39 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* HACKING: indent other than GNU indent should be OK
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e4296dc8f..3fd338790 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Sep 20 18:21:46 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* ltconfig.sh: Patch to libtool-1.2b to make --disable-static
+	work.
+
 Sun Sep 20 09:52:39 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* HACKING: indent other than GNU indent should be OK
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e4296dc8f..3fd338790 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Sep 20 18:21:46 1998  Owen Taylor  <otaylor@redhat.com>
+
+	* ltconfig.sh: Patch to libtool-1.2b to make --disable-static
+	work.
+
 Sun Sep 20 09:52:39 1998  Owen Taylor  <otaylor@gtk.org>
 
 	* HACKING: indent other than GNU indent should be OK
diff --git a/ltmain.sh b/ltmain.sh
index cb8174715..062d3f238 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -932,7 +932,7 @@ if test -z "$show_help"; then
       install_libdir="$2"
 
       # Now set the variables for building old libraries.
-      oldlibs="$objdir/$libname.a"
+      oldlibs=
       if test -z "$rpath"; then
 	# Building a libtool convenience library.
 	oldlibs="$objdir/$libname.al $oldlibs"
@@ -1074,6 +1074,14 @@ if test -z "$show_help"; then
         fi
       fi
 
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+        oldlibs="$oldlibs $objdir/$libname.a"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
+      fi
+
       if test "$build_libtool_libs" = yes; then
 	# Get the real and link names of the library.
 	eval library_names=\"$library_names_spec\"
@@ -1096,9 +1104,6 @@ if test -z "$show_help"; then
 	# Use standard objects if they are PIC.
 	test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'`
 
-	# Transform .lo files to .o files.
-	test "$build_old_libs" = yes && oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
-
 	if test -n "$whole_archive_flag_spec"; then
 	  if test -n "$convenience"; then
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"