Commit 30917ed3 authored by Martin Storsjö's avatar Martin Storsjö Committed by Niels Möller

* 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
parent 0a97296f
...@@ -11,6 +11,7 @@ DEFS = @DEFS@ ...@@ -11,6 +11,7 @@ DEFS = @DEFS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
EMULATOR = @EMULATOR@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
......
...@@ -255,6 +255,7 @@ SHLIBCFLAGS="$CCPIC" ...@@ -255,6 +255,7 @@ SHLIBCFLAGS="$CCPIC"
IF_DLL='#' IF_DLL='#'
LIBNETTLE_FILE_SRC='$(LIBNETTLE_FORLINK)' LIBNETTLE_FILE_SRC='$(LIBNETTLE_FORLINK)'
LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FORLINK)' LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FORLINK)'
EMULATOR=''
case "$host_os" in case "$host_os" in
mingw32*|cygwin*) mingw32*|cygwin*)
...@@ -272,6 +273,15 @@ case "$host_os" in ...@@ -272,6 +273,15 @@ case "$host_os" in
LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll' LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR)-$(LIBHOGWEED_MINOR).dll'
;; ;;
esac esac
# FIXME: Support native compilation using mingw on windows.
case "$ABI" in
64)
EMULATOR=wine64
;;
*)
EMULATOR=wine
;;
esac
LIBNETTLE_SONAME='' LIBNETTLE_SONAME=''
LIBNETTLE_FILE='libnettle.dll.a' LIBNETTLE_FILE='libnettle.dll.a'
LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)' LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)'
...@@ -445,6 +455,7 @@ AC_SUBST(ASM_ELF_STYLE) ...@@ -445,6 +455,7 @@ AC_SUBST(ASM_ELF_STYLE)
AC_SUBST(ASM_TYPE_FUNCTION) AC_SUBST(ASM_TYPE_FUNCTION)
AC_SUBST(ASM_MARK_NOEXEC_STACK) AC_SUBST(ASM_MARK_NOEXEC_STACK)
AC_SUBST(ASM_ALIGN_LOG) AC_SUBST(ASM_ALIGN_LOG)
AC_SUBST(EMULATOR)
AC_SUBST(SHLIBCFLAGS) AC_SUBST(SHLIBCFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment