* libtool.m4 (_LT_AC_LTCONFIG_HACK): Revert to 1.3.x

sematics, and always build static libs when the host machine
cannot build shared libs.  Even if static libs were explicitly
disabled.

diff --git a/ChangeLog b/ChangeLog
index b885be7e131f6f1255051b2f81ce90bd903836fc..cbb94b5d027d427ee66979a780934b77d54305df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-07-05  Gary V. Vaughan  <gary@gnu.org>
 
+       * libtool.m4 (_LT_AC_LTCONFIG_HACK):  Revert to 1.3.x
+       sematics, and always build static libs when the host machine
+       cannot build shared libs.  Even if static libs were explicitly
+       disabled.
+
        * libtool.m4 (AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE) [HPUX]: Define
        lt_cv_sys_global_symbol_to_c_name_address to be a sed expression
        for mangling the output of the symbol pipe into a brace delimited

diff --git a/libtool.m4 b/libtool.m4
index fc94bec414d0fadbe90c0c0ac09e68c171962fda..e68ed6afc2ba63bd1540c25621cd51cea02ae8fe 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -2230,6 +2230,39 @@ AC_MSG_RESULT([$can_build_shared])
 ##
 ## END FIXME
 
+## FIXME: this should be a separate macro
+##
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix4*)
+  test "$enable_shared" = yes && enable_static=no
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+##
+## END FIXME
+
+## FIXME: this should be a separate macro
+##
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+##
+## END FIXME
+
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
   enable_fast_install=no
@@ -2396,12 +2429,12 @@ SHELL=$lt_SHELL
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$need_lc
-
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$need_lc
+
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install