From 39c32d9fe34c1871d2f308fac6c2a7b728964d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 24 Nov 2011 12:01:37 +0100
Subject: [PATCH] * configure.ac (EMULATOR): New substituted variable. Set to
wine 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 | 1 +
configure.ac | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/config.make.in b/config.make.in
index 3caa460b..2f26556c 100644
--- a/config.make.in
+++ b/config.make.in
@@ -11,6 +11,7 @@ DEFS = @DEFS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
LIBOBJS = @LIBOBJS@
+EMULATOR = @EMULATOR@
OBJEXT = @OBJEXT@
EXEEXT = @EXEEXT@
diff --git a/configure.ac b/configure.ac
index 0c1f84bb..6b6ddf36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
--
GitLab