summaryrefslogtreecommitdiff
path: root/Build/source/texk/psutils
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/texk/psutils
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/texk/psutils')
-rw-r--r--Build/source/texk/psutils/Makefile.in3
-rwxr-xr-xBuild/source/texk/psutils/configure37
2 files changed, 38 insertions, 2 deletions
diff --git a/Build/source/texk/psutils/Makefile.in b/Build/source/texk/psutils/Makefile.in
index e78f73d697f..d2191164434 100644
--- a/Build/source/texk/psutils/Makefile.in
+++ b/Build/source/texk/psutils/Makefile.in
@@ -537,6 +537,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -628,7 +629,7 @@ scriptsdir = texmf-dist/scripts/psutils
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)
texmf_SCRIPTS = $(perl_scripts:=.pl)
man1_MANS = \
diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure
index b557a3a7a6a..448eeab3985 100755
--- a/Build/source/texk/psutils/configure
+++ b/Build/source/texk/psutils/configure
@@ -639,6 +639,7 @@ LIBOBJS
PSUTILS_TREE
WIN32_WRAP_FALSE
WIN32_WRAP_TRUE
+WIN_WRAPPER
WIN32_FALSE
WIN32_TRUE
LIBPAPER_RULE
@@ -14503,7 +14504,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