diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-09-20 22:14:19 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-09-20 22:14:19 +0000 |
| commit | b2268f6834e87139b503d2a5f01a3061bc9e2cc1 (patch) | |
| tree | b39b946fa2bee15c9b99c8168694e0c9ffa4e933 /ltmain.sh | |
| parent | 034e7c0339f64d4d52a53f2324daa2fca0332add (diff) | |
| download | glib-b2268f6834e87139b503d2a5f01a3061bc9e2cc1.tar.gz | |
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
Diffstat (limited to 'ltmain.sh')
| -rw-r--r-- | ltmain.sh | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -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\" |