Improved setup för darwin shared libraries. Patch contributed by Ryan

Schmidt.

Rev: nettle/ChangeLog:1.226
Rev: nettle/configure.ac:1.43

diff --git a/ChangeLog b/ChangeLog
index 148e9e03d6ed8d75d76aaab85309475289b5a338..4f89546a158d6c8682aec85c2aa935af039b96d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-18  Niels Möller  <nisse@lysator.liu.se>
+
+       * configure.ac: Improved setup för darwin shared libraries.
+       Patch contributed by Ryan Schmidt.
+
 2011-10-03  Niels Möller  <nisse@lysator.liu.se>
 
        * x86_64/memxor.asm: Implemented sse2-loop. Configured at compile

diff --git a/configure.ac b/configure.ac
index b48a520a39fb7863a0980d283de847f761abb922..665e671d9283eb3b86cf380b450d4f77e3fe569f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -281,16 +281,16 @@ case "$host_os" in
     ;;
   darwin*)
     LIBNETTLE_FORLINK=libnettle.dylib
-    LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
-    LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)'
-    LIBNETTLE_LINK='$(CC) -dynamiclib $(LDFLAGS)'
+    LIBNETTLE_SONAME='libnettle.$(LIBNETTLE_MAJOR).dylib'
+    LIBNETTLE_FILE='libnettle.$(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR).dylib'
+    LIBNETTLE_LINK='$(CC) -dynamiclib $(LDFLAGS) -install_name ${libdir}/$(LIBNETTLE_SONAME) -compatibility_version $(LIBNETTLE_MAJOR) -current_version $(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR)'
     LIBNETTLE_LIBS=''
 
     LIBHOGWEED_FORLINK=libhogweed.dylib
-    LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
-    LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
-    LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)'
-    LIBHOGWEED_LIBS=''
+    LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR).dylib'
+    LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR).dylib'
+    LIBHOGWEED_LINK='$(CC) -dynamiclib -L. $(LDFLAGS) -install_name ${libdir}/$(LIBHOGWEED_SONAME) -compatibility_version $(LIBHOGWEED_MAJOR) -current_version $(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)'
+    LIBHOGWEED_LIBS='-lnettle -gmp'
     ;;
   solaris*)
     # Sun's ld uses -h to set the soname, and this option is passed