Alexandre Julliard : libwine: Also set the current library version for MacOS.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 946b84d96c61b525cb92d1d0b455ec50dbf6f2dc
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=946b84d96c61b525cb92d1d0...

Author: Alexandre Julliard 
Date:   Mon Aug 14 20:45:32 2006 +0200

libwine: Also set the current library version for MacOS.

---

configure             |    2 +-
 configure.ac          |    2 +-
 libs/wine/Makefile.in |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index d8c326a..847cb4f 100755
--- a/configure
+++ b/configure
@@ -17082,7 +17082,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6; 
           then
             LIBEXT="dylib"
             LDDLLFLAGS="-bundle -multiply_defined suppress"
-            LDSHARED="$(CC) -dynamiclib -install_name @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $(SOVERSION:%=-compatibility_version %)"
+            LDSHARED="$(CC) -dynamiclib -install_name @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME)"
             STRIP="$STRIP -u -r"
                         COREFOUNDATIONLIB="-framework CoreFoundation"

diff --git a/configure.ac b/configure.ac
index c5e6bb4..1c8477d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1151,7 +1151,7 @@ case $host_os in
           then
             LIBEXT="dylib"
             LDDLLFLAGS="-bundle -multiply_defined suppress"
-            LDSHARED="$(CC) -dynamiclib -install_name @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $(SOVERSION:%=-compatibility_version %)"
+            LDSHARED="$(CC) -dynamiclib -install_name @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME)"
             STRIP="$STRIP -u -r"
             dnl declare needed frameworks
             AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 5ad4bc6..c206b88 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -131,8 +131,10 @@ libwine.a: wine.def
 libwine.dll: $(OBJS) wine.def Makefile.in
    $(DLLWRAP) --def $(SRCDIR)/wine.def -o $@ $(OBJS) $(EXTRALIBS)

+DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION)
+
 libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in
-	$(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
+	$(LDSHARED) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@

libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib
    $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@