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

5 files changed, 7 insertions, 84 deletions

diff --git a/Build/source/utils/m-tx/ChangeLog b/Build/source/utils/m-tx/ChangeLog
index 8382f27fd49..f7652601175 100644
--- a/Build/source/utils/m-tx/ChangeLog
+++ b/Build/source/utils/m-tx/ChangeLog
@@ -1,6 +1,10 @@
+2014-11-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Drop KPSE_COND_WIN32_WRAP.
+
 2014-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* m-tx.1 (removed): Maintained under Mastr, not here.
+	* m-tx.1 (removed): Maintained under Master, not here.
 	* Makefile.am: Adjusted.
 
 2013-01-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
diff --git a/Build/source/utils/m-tx/Makefile.in b/Build/source/utils/m-tx/Makefile.in
index 57ef25dd9ee..90f1cf2cbbc 100644
--- a/Build/source/utils/m-tx/Makefile.in
+++ b/Build/source/utils/m-tx/Makefile.in
@@ -93,8 +93,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/Build/source/utils/m-tx/aclocal.m4 b/Build/source/utils/m-tx/aclocal.m4
index 084accf15c3..7788d8b5d0a 100644
--- a/Build/source/utils/m-tx/aclocal.m4
+++ b/Build/source/utils/m-tx/aclocal.m4
@@ -1185,4 +1185,3 @@ AC_SUBST([am__untar])
 
 m4_include([../../m4/kpse-common.m4])
 m4_include([../../m4/kpse-warnings.m4])
-m4_include([../../m4/kpse-win32.m4])
diff --git a/Build/source/utils/m-tx/configure b/Build/source/utils/m-tx/configure
index dec329db232..d0984a130a5 100755
--- a/Build/source/utils/m-tx/configure
+++ b/Build/source/utils/m-tx/configure
@@ -633,10 +633,6 @@ GREP
 CPP
 RANLIB
 LN_S
-WIN32_WRAP_FALSE
-WIN32_WRAP_TRUE
-WIN32_FALSE
-WIN32_TRUE
 WARNING_CFLAGS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -4716,71 +4712,6 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
-$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
-if ${kpse_cv_have_win32+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef WIN32
-  choke me
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __MINGW32__
-  choke me
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  kpse_cv_have_win32=mingw32
-else
-  kpse_cv_have_win32=native
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  kpse_cv_have_win32=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_win32" >&5
-$as_echo "$kpse_cv_have_win32" >&6; }
-
- if test "x$kpse_cv_have_win32" != xno; then
-  WIN32_TRUE=
-  WIN32_FALSE='#'
-else
-  WIN32_TRUE='#'
-  WIN32_FALSE=
-fi
-
-
- if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then
-  WIN32_WRAP_TRUE=
-  WIN32_WRAP_FALSE='#'
-else
-  WIN32_WRAP_TRUE='#'
-  WIN32_WRAP_FALSE=
-fi
-
-
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
@@ -5781,14 +5712,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
-  as_fn_error $? "conditional \"WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${WIN32_WRAP_TRUE}" && test -z "${WIN32_WRAP_FALSE}"; then
-  as_fn_error $? "conditional \"WIN32_WRAP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/Build/source/utils/m-tx/configure.ac b/Build/source/utils/m-tx/configure.ac
index 5cf672a5ba0..2767e285260 100644
--- a/Build/source/utils/m-tx/configure.ac
+++ b/Build/source/utils/m-tx/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -18,8 +18,6 @@ KPSE_BASIC([m-tx])
 dnl Check compiler and flags
 AC_PROG_CC
 
-KPSE_COND_WIN32_WRAP
-
 dnl Checks for programs.
 AC_PROG_INSTALL
 AC_PROG_LN_S