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

11 files changed, 47 insertions, 2 deletions

diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index db2decec7f3..4634c32dc4e 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -284,6 +284,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
@@ -349,7 +350,7 @@ scriptsdir = texmf-dist/scripts/xindy
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
 texmfdir = $(datarootdir)/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
 CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index cc5dce3d9da..487facb72a4 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -598,6 +598,7 @@ CLISP_RUNTIME_TRUE
 XINDY_TREE
 WIN32_WRAP_FALSE
 WIN32_WRAP_TRUE
+WIN_WRAPPER
 WIN32_FALSE
 WIN32_TRUE
 LISP_RUN
@@ -5067,7 +5068,41 @@ else
 fi
 
 
- if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5
+$as_echo_n "checking for WIN64... " >&6; }
+if ${kpse_cv_have_win64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef _WIN64
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  kpse_cv_have_win64=yes
+else
+  kpse_cv_have_win64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5
+$as_echo "$kpse_cv_have_win64" >&6; }
+case $kpse_cv_have_win64 in #(
+  yes) :
+    WIN_WRAPPER=w64_wrapper ;; #(
+  *) :
+    WIN_WRAPPER=w32_wrapper ;;
+esac
+
+ if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then
   WIN32_WRAP_TRUE=
   WIN32_WRAP_FALSE='#'
 else
diff --git a/Build/source/utils/xindy/xindy-2.5.1/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/Makefile.in
index 477ad26c51d..9d91ba8bbd2 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/Makefile.in
@@ -263,6 +263,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in
index 36daf1bed30..3a321148e87 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in
@@ -195,6 +195,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in
index d5cf8d4b567..6476a43c7d5 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in
@@ -224,6 +224,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in
index 027d5aa179b..078ceec8221 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in
@@ -221,6 +221,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in
index 8675d639774..0db63b3c54a 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in
@@ -194,6 +194,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in
index edffbd642de..51da8b123dc 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in
@@ -199,6 +199,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in
index 73098f10481..449a6c8a93d 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in
@@ -194,6 +194,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in
index a39a1543f3f..69ba8343de1 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in
@@ -244,6 +244,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in
index 452e14f112f..691b846b94d 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in
@@ -198,6 +198,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@