From Martin Storsjö:

* configure.ac: Unify shared lib setup for cygwin and mingw. Rev: nettle/ChangeLog:1.229 Rev: nettle/configure.ac:1.46

From Martin Storsjö:
* configure.ac: Unify shared lib setup for cygwin and mingw. Rev: nettle/ChangeLog:1.229 Rev: nettle/configure.ac:1.46
c7d01ac6 · Martin Storsjö · Niels Möller · ed88dd1d · c7d01ac6 · c7d01ac6
Commit c7d01ac6 authored Nov 19, 2011 by Martin Storsjö Committed by Niels Möller Nov 19, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 16 deletions

nettle/ChangeLog nettle/ChangeLog +5 -0

nettle/configure.ac nettle/configure.ac +11 -16

No files found.
--- a/nettle/ChangeLog
+++ b/nettle/ChangeLog
+2011-11-19  Niels Mller  <nisse@lysator.liu.se>
+
+	From Martin Storsj:
+	* configure.ac: Unify shared lib setup for cygwin and mingw.
+
 2011-10-31  Niels Mller  <nisse@lysator.liu.se>

 	* configure.ac (LIBHOGWEED_LIBS): Typo fix for the darwin case.

--- a/nettle/configure.ac
+++ b/nettle/configure.ac
@@ -253,27 +253,22 @@ LSH_CCPIC
 SHLIBCFLAGS="$CCPIC"

 case "$host_os" in
-  mingw32*)
-    LIBNETTLE_FORLINK='libnettle-$(LIBNETTLE_MAJOR)-$(LIBNETTLE_MINOR).dll'
-    LIBNETTLE_SONAME=''
-    LIBNETTLE_FILE='libnettle.dll.a'
-    LIBNETTLE_LINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBNETTLE_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
-    LIBNETTLE_LIBS='-Wl,--no-whole-archive $(LIBS)'
-
-    LIBHOGWEED_FORLINK='libhogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
-    LIBHOGWEED_SONAME=''
-    LIBHOGWEED_FILE='libhogweed.dll.a'
-    LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBHOGWEED_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
-    LIBHOGWEED_LIBS='-Wl,--no-whole-archive $(LIBS) libnettle.dll.a'
-    ;;
-  cygwin*)
-    LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR)-$(LIBNETTLE_MINOR).dll'
+  mingw32*|cygwin*)
+    case "$host_os" in
+      mingw32*)
+        LIBNETTLE_FORLINK='libnettle-$(LIBNETTLE_MAJOR)-$(LIBNETTLE_MINOR).dll'
+        LIBHOGWEED_FORLINK='libhogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
+        ;;
+      cygwin*)
+        LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR)-$(LIBNETTLE_MINOR).dll'
+        LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
+        ;;
+    esac
    LIBNETTLE_SONAME=''
    LIBNETTLE_FILE='libnettle.dll.a'
    LIBNETTLE_LINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBNETTLE_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
    LIBNETTLE_LIBS='-Wl,--no-whole-archive $(LIBS)'

-    LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
    LIBHOGWEED_SONAME=''
    LIBHOGWEED_FILE='libhogweed.dll.a'
    LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBHOGWEED_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'