* ltmain.in: Change semantics of `--tag=disable-static' and

`--tag=disable-shared': The last one given wins now, both
override the default setting inherited by other `--tag'
arguments, even if passed later on the command line.
Still make sure we do not disable both kinds by falling back
to static libraries.

diff --git a/ChangeLog b/ChangeLog
index 1cfabdb44cca00b9862e0e1cc2b7c209f2bb2ec5..ef9aafe1de4ff72d5fbd1245e05e588f4f0c5ce4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-12-18  Marc Espie  <espie@nerim.net>
 
+       * ltmain.in: Change semantics of `--tag=disable-static' and
+       `--tag=disable-shared': The last one given wins now, both
+       override the default setting inherited by other `--tag'
+       arguments, even if passed later on the command line.
+       Still make sure we do not disable both kinds by falling back
+       to static libraries.
+
        * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ openbsd ]
        <sys_lib_dlsearch_path_spec>: Set to `/usr/lib' only.
 

diff --git a/ltmain.in b/ltmain.in
index 1cac54161a87ed5239f7f38a15228746a40c566d..10a434a9c56c6db5e1d7416937494a8e4106cbcb 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -351,6 +351,8 @@ func_extract_archives ()
 # Darwin sucks
 eval std_shrext=\"$shrext_cmds\"
 
+disable_libs=no
+
 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
 do
@@ -503,6 +505,18 @@ if test -n "$prevopt"; then
   exit $EXIT_FAILURE
 fi
 
+case $disable_libs in
+no) 
+  ;;
+shared)
+  build_libtool_libs=no
+  build_old_libs=yes
+  ;;
+static)
+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+  ;;
+esac
+
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
@@ -6748,12 +6762,11 @@ exit $?
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
+disable_libs=shared
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+disable_libs=static
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables: