Mercurial > octave-nkf

changeset 8675:43c6012bd4c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.in: separate cases for cygwin and mingw
author Benjamin Lindner <lindnerben@gmx.net>
date Wed, 04 Feb 2009 17:48:30 -0500
parents 0d263850d582
children 22462fd58e66
files ChangeLog configure.in
diffstat 2 files changed, 21 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 04 17:14:14 2009 -0500
+++ b/ChangeLog	Wed Feb 04 17:48:30 2009 -0500
@@ -1,3 +1,8 @@
+2009-02-04  Benjamin Lindner  <lindnerben@gmx.net>
+
+	* configure.in: Use separate cases for *-*-mingw* and *-*-cygwin*
+	to set variables related to creating shared libraries.
+
 2009-02-03  Jaroslav Hajek  <highegg@gmail.com>
 
 	* aclocal.m4 (AC_CHECK_QHULL_OK): New macro, based on suggestion by
--- a/configure.in	Wed Feb 04 17:14:14 2009 -0500
+++ b/configure.in	Wed Feb 04 17:48:30 2009 -0500
@@ -1243,14 +1243,10 @@
     SONAME_FLAGS='-install_name $(octlibdir)/$@'
     library_path_var=DYLD_LIBRARY_PATH	
   ;;
-  *-*-mingw* | *-*-cygwin*)
-    case "$canonical_host_type" in
-      *-*-cygwin*)
-        LIBPRE=cyg
-	SHLLIBPRE=cyg
-        SHLBINPRE=lib
-      ;;
-    esac
+  *-*-cygwin*)
+    LIBPRE=cyg
+    SHLLIBPRE=cyg
+    SHLBINPRE=lib
     SHLEXT=dll
     SHLLIB=dll.a
     SHLBIN=a    
@@ -1258,6 +1254,18 @@
     SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
     SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLLIBPRE)%,$(SHLBINPRE)%,$@).a'
   ;;
+  *-*-mingw*)
+    CPICFLAG=
+    CXXPICFLAG=
+    FPICFLAG=
+    SHLEXT=dll
+    SHLLIB=dll.a
+    SHLBIN=dll
+    DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
+    SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
+    SONAME_FLAGS='-Wl,--out-implib=$@.a'
+    library_path_var=PATH
+  ;;
 
   *-*-msdosmsvc)
     DL_LDFLAGS="-shared"