Add (very limited) libtool 1.5 --tag support

diff --git a/build/ltmain.sh b/build/ltmain.sh
index cc95125f0275f3dfefd6f267110cb8f5174ed3e7..d54be8d39d481e9dee7ca93b6a2f0a1dfe35faee 100755 (executable)
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -201,6 +201,22 @@ do
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
+  --tag=*)
+       case "$optarg" in
+       CC)
+               ;;
+       disable-shared)
+               build_libtool_libs=no
+               ;;
+       disable-static)
+               build_old_libs=no
+               ;;
+       *)
+               echo "unknown tag"
+               exit 1;
+       esac
+       ;;
+
   --preserve-dup-deps) duplicate_deps="yes" ;;
 
   --quiet | --silent)

diff --git a/build/top.mk b/build/top.mk
index 57af87d6c5f11c1245a93791c061bd2f1a57302c..afdac27b591b2fc5e9a54823ff3ef2169981d671 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -70,7 +70,8 @@ MKDEP_CFLAGS = @OL_MKDEP_FLAGS@
 
 MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 
-LIBTOOL = @LIBTOOL@
+# libtool 1.5+ requires "--tag=CC", but leave it off until we migrate
+LIBTOOL = @LIBTOOL@ # --tag=CC
 LIBRELEASE = @OPENLDAP_LIBRELEASE@
 LIBVERSION = @OPENLDAP_LIBVERSION@
 LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
@@ -81,9 +82,9 @@ LTONLY_LIB = $(@PLAT@_LTONLY_LIB)
 
 # libtool --only flag for modules: depends on linkage of module
 # The BUILD_MOD macro is defined in each backend Makefile.in file
-LTONLY_yes = static
-LTONLY_mod = shared
-LTONLY_MOD = # --only-$(BUILD_MOD)
+LTONLY_yes = --tag=disable-shared
+LTONLY_mod = --tag=disable-static
+LTONLY_MOD = $(LTONLY_$(BUILD_MOD))
 
 # platform-specific libtool flags
 NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir)