ltmain.sh (TAG disable-shared, [...]): Make sure we keep at least one of build_libtool_libs or build_old_libs set to yes.

* ltmain.sh (TAG disable-shared, TAG disable-static): Make sure we
keep at least one of build_libtool_libs or build_old_libs set to
yes.

From-SVN: r39245
This commit is contained in:
Alexandre Oliva 2001-01-24 20:08:50 +00:00 committed by Alexandre Oliva
parent 445c435a52
commit 9bad11e125
2 changed files with 18 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2001-01-24 Alexandre Oliva <aoliva@redhat.com> 2001-01-24 Alexandre Oliva <aoliva@redhat.com>
* ltmain.sh (TAG disable-shared, TAG disable-static): Make sure we
keep at least one of build_libtool_libs or build_old_libs set to
yes.
* ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'. * ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'.
* libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on. * libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on.

View File

@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services. # ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun ltconfig. # NOTE: Changing this file will not affect anything until you rerun ltconfig.
# #
# Copyright (C) 1996-2000 Free Software Foundation, Inc. # Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -5006,12 +5006,24 @@ $echo "Try \`$modename --help' for more information about other modes."
exit 0 exit 0
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
# them. This is particularly important on AIX, because we don't
# support having both static and shared libraries enabled at the same
# time on that platform, so we default to a shared-only configuration.
# If a disable-shared tag is given, we'll fallback to a static-only
# configuration. But we'll never go from static-only to shared-only.
### BEGIN LIBTOOL TAG CONFIG: disable-shared ### BEGIN LIBTOOL TAG CONFIG: disable-shared
build_libtool_libs=no build_libtool_libs=no
build_old_libs=yes
### END LIBTOOL TAG CONFIG: disable-shared ### END LIBTOOL TAG CONFIG: disable-shared
### BEGIN LIBTOOL TAG CONFIG: disable-static ### BEGIN LIBTOOL TAG CONFIG: disable-static
build_old_libs=no build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
### END LIBTOOL TAG CONFIG: disable-static ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables: # Local Variables: