Update libtool LTLIBLINK vs LTLINK -version-info handling... (from -devel)

diff --git a/CHANGES b/CHANGES
index 8bed41e67a5c281f6501dc239fd5476fe27dbc86..245fa7a4ba4497dfefed25f7c01534c43f48d37f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ Changes included in OpenLDAP 1.2 Release Engineering
                Updated to latest Autoconf (AnonCVS)
                Updated to latest aclocal from Automake (AnonCVS)
                Updated to libtool-1.3.3.
+               Updated libtool -version-info handling
                Don't use "ln -s -f file link" (ITS#227)
        Documentation
                Added -n option to ldif2ldbm(8) (ITS#59)

diff --git a/build/lib-shared.mk b/build/lib-shared.mk
index 59fc6e9637b14ddc9db1d0bf142459a050a3da58..9a11df107ab29c0d26eec840cf21536c1d66bdc1 100644 (file)
--- a/build/lib-shared.mk
+++ b/build/lib-shared.mk
@@ -6,8 +6,6 @@
 ## Makefile Template for Shared Libraries
 ##
 
-LTVERSION = -version-info $(LIBVERSION)
-LINK    = $(LTLINK)
 COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c
 MKDEPFLAG = -l
 
@@ -17,7 +15,7 @@ MKDEPFLAG = -l
        $(COMPILE) $<
 
 $(LIBRARY):  version.lo
-       $(LINK) -rpath $(libdir) -o $@ $(OBJS) version.lo
+       $(LTLIBLINK) -rpath $(libdir) -o $@ $(OBJS) version.lo
        $(RM) ../$@;    \
        (d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
        $(RM) ../`$(BASENAME) $@ .la`.a;        \

diff --git a/build/top.mk b/build/top.mk
index 8efa2fadf7facd0a2887b6e5755c2c0e6e6d32ed..505ae4beef37c9ce5d11cb4250388acef0212e03 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -53,7 +53,9 @@ MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -d "$(srcdir)" -c "$(CC)"
 
 LIBTOOL = @LIBTOOL@
 LIBVERSION = 1:0:0
-LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
+LTVERSION = -version-info $(LIBVERSION)
+LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
+LTLIBLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
 # Misc UNIX commands used in makefiles