summaryrefslogtreecommitdiff
path: root/Build/source/utils/pmx
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/utils/pmx
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/utils/pmx')
-rw-r--r--Build/source/utils/pmx/ChangeLog4
-rwxr-xr-xBuild/source/utils/pmx/configure15
-rw-r--r--Build/source/utils/pmx/configure.ac4
3 files changed, 6 insertions, 17 deletions
diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog
index 87832e9bb1c..d3b0d433d68 100644
--- a/Build/source/utils/pmx/ChangeLog
+++ b/Build/source/utils/pmx/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Replace KPSE_COND_WIN32_WRAP => KPSE_COND_WIN32.
+
2014-05-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* pmx2pdf.1 (removed): Maintained under Mastr, not here.
diff --git a/Build/source/utils/pmx/configure b/Build/source/utils/pmx/configure
index 8e07c76e67d..61558985972 100755
--- a/Build/source/utils/pmx/configure
+++ b/Build/source/utils/pmx/configure
@@ -632,8 +632,6 @@ GREP
CPP
RANLIB
LN_S
-WIN32_WRAP_FALSE
-WIN32_WRAP_TRUE
WIN32_FALSE
WIN32_TRUE
PMX_DEFINES
@@ -4745,15 +4743,6 @@ else
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
-
-
case $kpse_cv_have_win32 in #(
native) :
PMX_DEFINES="$PMX_DEFINES -DMSDOS" ;; #(
@@ -5576,10 +5565,6 @@ 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/pmx/configure.ac b/Build/source/utils/pmx/configure.ac
index 4130a9561d7..86967e1c173 100644
--- a/Build/source/utils/pmx/configure.ac
+++ b/Build/source/utils/pmx/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,
@@ -21,7 +21,7 @@ AC_PROG_CC
dnl initial value for PMX_DEFINES
AC_SUBST([PMX_DEFINES], ['-DNON_UNIX_STDIO'])
-KPSE_COND_WIN32_WRAP
+KPSE_COND_WIN32
dnl WIN32 has no <sys/times.h>, native WIN32 is as MSDOS
AS_CASE([$kpse_cv_have_win32],
[native], [PMX_DEFINES="$PMX_DEFINES -DMSDOS"],