]> git.ipfire.org Git - thirdparty/nettle.git/commitdiff
* configure.ac (EMULATOR): New substituted variable. Set to wine
authorMartin Storsjö <martin@martin.st>
Thu, 24 Nov 2011 11:01:37 +0000 (12:01 +0100)
committerNiels Möller <nisse@lysator.liu.se>
Thu, 24 Nov 2011 11:01:37 +0000 (12:01 +0100)
or wine64 when compiling for windows, otherwise empty.

* config.make.in (EMULATOR): Set from autoconf value.

Rev: nettle/config.make.in:1.5
Rev: nettle/configure.ac:1.49

config.make.in
configure.ac

index 3caa460b4e6d2f23b3f06470e2eefbd38fd2d4a0..2f26556c1bc767c50cdf16c9b89de95aad458a53 100644 (file)
@@ -11,6 +11,7 @@ DEFS = @DEFS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 LIBOBJS = @LIBOBJS@
+EMULATOR = @EMULATOR@
 
 OBJEXT = @OBJEXT@
 EXEEXT = @EXEEXT@
index 0c1f84bb3770be179b22a338dccb7ad4758c3f45..6b6ddf368cfe0c1b6f450afadae20891483b55b8 100644 (file)
@@ -255,6 +255,7 @@ SHLIBCFLAGS="$CCPIC"
 IF_DLL='#'
 LIBNETTLE_FILE_SRC='$(LIBNETTLE_FORLINK)'
 LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FORLINK)'
+EMULATOR=''
 
 case "$host_os" in
   mingw32*|cygwin*)
@@ -272,6 +273,15 @@ case "$host_os" in
         LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
         ;;
     esac
+    # FIXME: Support native compilation using mingw on windows.
+    case "$ABI" in
+    64)
+        EMULATOR=wine64
+        ;;
+    *)
+        EMULATOR=wine
+        ;;
+    esac
     LIBNETTLE_SONAME=''
     LIBNETTLE_FILE='libnettle.dll.a'
     LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)'
@@ -445,6 +455,7 @@ AC_SUBST(ASM_ELF_STYLE)
 AC_SUBST(ASM_TYPE_FUNCTION)
 AC_SUBST(ASM_MARK_NOEXEC_STACK)
 AC_SUBST(ASM_ALIGN_LOG)
+AC_SUBST(EMULATOR)
 
 AC_SUBST(SHLIBCFLAGS)