summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-17 12:28:11 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-17 12:28:11 +0000
commitf9abbd4480558852ac23ae084ffdfe7314c85055 (patch)
treee5e9166ac8da83f93fd93814718574343b015b9f /Build/source/m4
parentc7e0b092294e4f2c5a1accbd07694c7e42017bbd (diff)
Build system: Use 64-bit Windows wrapper binaries for 64-bit MinGW
git-svn-id: svn://tug.org/texlive/trunk@35596 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog4
-rw-r--r--Build/source/m4/kpse-win32.m417
2 files changed, 18 insertions, 3 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 15d9eeada3b..d5882502be9 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-win32.m4: Check for WIN64 and AC_SUBST([WIN_WRAPPER]).
+
2014-10-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-lua52-flags.m4: Lua52 is now a Libtool library.
diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4
index 4f1ac085149..9d6375404fa 100644
--- a/Build/source/m4/kpse-win32.m4
+++ b/Build/source/m4/kpse-win32.m4
@@ -13,10 +13,10 @@ AC_CACHE_CHECK([for native WIN32 or MINGW32],
[kpse_cv_have_win32],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef WIN32
choke me
-#endif]], [[]])],
+#endif]])],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __MINGW32__
choke me
-#endif]], [[]])],
+#endif]])],
[kpse_cv_have_win32=mingw32],
[kpse_cv_have_win32=native])],
[kpse_cv_have_win32=no])])
@@ -43,8 +43,19 @@ AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32])
# Define the conditionals WIN32 and WIN32_WRAP.
AC_DEFUN([KPSE_COND_WIN32_WRAP], [dnl
AC_REQUIRE([KPSE_COND_WIN32])[]dnl
+AC_CACHE_CHECK([for WIN64],
+ [kpse_cv_have_win64],
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef _WIN64
+ choke me
+#endif]])],
+ [kpse_cv_have_win64=yes],
+ [kpse_cv_have_win64=no])])
+AS_CASE([$kpse_cv_have_win64],
+ [yes], [WIN_WRAPPER=w64_wrapper],
+ [WIN_WRAPPER=w32_wrapper])
+AC_SUBST([WIN_WRAPPER])
AM_CONDITIONAL([WIN32_WRAP],
- [test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"])
+ [test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"])
]) # KPSE_COND_WIN32_WRAP
# KPSE_WIN32_CALL