(EMULATOR): Set for cross compilation only.

Rev: nettle/ChangeLog:1.234
Rev: nettle/configure.ac:1.50

diff --git a/ChangeLog b/ChangeLog
index 6ec1af26002961600ab701f3a8667748f14f6ae5..3fd0d5076d5c200f374792ec861ad801aa0a6c26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@
        environment of run-tests.
 
        * configure.ac (EMULATOR): New substituted variable. Set to wine
-       or wine64 when compiling for windows, otherwise empty.
+       or wine64 when cross compiling for windows, otherwise empty.
 
        * config.make.in (EMULATOR): Set from autoconf value.
 

diff --git a/configure.ac b/configure.ac
index 6b6ddf368cfe0c1b6f450afadae20891483b55b8..3849947c2fc12b53c7389990715d751fb456d262 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -273,15 +273,16 @@ 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
+    if test "x$cross_compiling" = xyes ; then
+       case "$ABI" in
+           64)
+               EMULATOR=wine64
+               ;;
+           *)
+               EMULATOR=wine
+               ;;
+       esac
+    fi
     LIBNETTLE_SONAME=''
     LIBNETTLE_FILE='libnettle.dll.a'
     LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)'