From b2268f6834e87139b503d2a5f01a3061bc9e2cc1 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 20 Sep 1998 22:14:19 +0000 Subject: [PATCH] Patch to libtool-1.2b to make --disable-static Sun Sep 20 18:21:46 1998 Owen Taylor * ltconfig.sh: Patch to libtool-1.2b to make --disable-static --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ ltmain.sh | 13 +++++++++---- 9 files changed, 49 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c39be1ef1..6757c1af6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 20 18:21:46 1998 Owen Taylor + + * ltconfig.sh: Patch to libtool-1.2b to make --disable-static + work. + Sun Sep 20 02:09:44 1998 Josh MacDonald * glib.h: New function g_hash_table_foreach_remove is similar to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c39be1ef1..6757c1af6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Sep 20 18:21:46 1998 Owen Taylor + + * ltconfig.sh: Patch to libtool-1.2b to make --disable-static + work. + Sun Sep 20 02:09:44 1998 Josh MacDonald * glib.h: New function g_hash_table_foreach_remove is similar to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c39be1ef1..6757c1af6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Sep 20 18:21:46 1998 Owen Taylor + + * ltconfig.sh: Patch to libtool-1.2b to make --disable-static + work. + Sun Sep 20 02:09:44 1998 Josh MacDonald * glib.h: New function g_hash_table_foreach_remove is similar to diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c39be1ef1..6757c1af6 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Sep 20 18:21:46 1998 Owen Taylor + + * ltconfig.sh: Patch to libtool-1.2b to make --disable-static + work. + Sun Sep 20 02:09:44 1998 Josh MacDonald * glib.h: New function g_hash_table_foreach_remove is similar to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c39be1ef1..6757c1af6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Sep 20 18:21:46 1998 Owen Taylor + + * ltconfig.sh: Patch to libtool-1.2b to make --disable-static + work. + Sun Sep 20 02:09:44 1998 Josh MacDonald * glib.h: New function g_hash_table_foreach_remove is similar to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c39be1ef1..6757c1af6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Sep 20 18:21:46 1998 Owen Taylor + + * ltconfig.sh: Patch to libtool-1.2b to make --disable-static + work. + Sun Sep 20 02:09:44 1998 Josh MacDonald * glib.h: New function g_hash_table_foreach_remove is similar to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c39be1ef1..6757c1af6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Sep 20 18:21:46 1998 Owen Taylor + + * ltconfig.sh: Patch to libtool-1.2b to make --disable-static + work. + Sun Sep 20 02:09:44 1998 Josh MacDonald * glib.h: New function g_hash_table_foreach_remove is similar to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c39be1ef1..6757c1af6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Sep 20 18:21:46 1998 Owen Taylor + + * ltconfig.sh: Patch to libtool-1.2b to make --disable-static + work. + Sun Sep 20 02:09:44 1998 Josh MacDonald * glib.h: New function g_hash_table_foreach_remove is similar to 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\"