pmx: Adapt to W32TeX (more). Fixed a typo (AM_CPPPFLAGS => AM_CPPFLAGS)

git-svn-id: svn://tug.org/texlive/trunk@27011 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 32 insertions, 8 deletions

diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog
index e0102b69495..c20461a0479 100644
--- a/Build/source/utils/pmx/ChangeLog
+++ b/Build/source/utils/pmx/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Fixed a typo (AM_CPPPFLAGS => AM_CPPFLAGS).
+
 2012-05-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: do handle pmx2pdf.lua here, since although it is
diff --git a/Build/source/utils/pmx/configure b/Build/source/utils/pmx/configure
index 448f5c7c10d..765efd3e821 100755
--- a/Build/source/utils/pmx/configure
+++ b/Build/source/utils/pmx/configure
@@ -3895,9 +3895,9 @@ $as_echo "$kpse_cv_have_win32" >&6; }
 
 case $kpse_cv_have_win32 in #(
   native) :
-    AM_CPPFLAGS="$AM_CPPPFLAGS -DMSDOS" ;; #(
+    AM_CPPFLAGS="$AM_CPPFLAGS -DMSDOS" ;; #(
   mingw32) :
-    AM_CPPFLAGS="$AM_CPPPFLAGS -DUSE_CLOCK" ;; #(
+    AM_CPPFLAGS="$AM_CPPFLAGS -DUSE_CLOCK" ;; #(
   *) :
      ;;
 esac
@@ -4526,7 +4526,7 @@ _ACEOF
 
 
 if test $ac_cv_sizeof_long_long -lt 8; then
-  AM_CPPFLAGS="$AM_CPPPFLAGS -DNO_LONG_LONG"
+  AM_CPPFLAGS="$AM_CPPFLAGS -DNO_LONG_LONG"
 fi
 
 PMX_TREE=pmx-2.6.18
diff --git a/Build/source/utils/pmx/configure.ac b/Build/source/utils/pmx/configure.ac
index cc355615553..d1b5d70ce99 100644
--- a/Build/source/utils/pmx/configure.ac
+++ b/Build/source/utils/pmx/configure.ac
@@ -32,8 +32,8 @@ AC_SUBST([AM_CPPFLAGS], ['-DNON_UNIX_STDIO'])
 dnl WIN32 has no <sys/times.h>, native WIN32 is as MSDOS
 KPSE_CHECK_WIN32
 AS_CASE([$kpse_cv_have_win32],
-        [native], [AM_CPPFLAGS="$AM_CPPPFLAGS -DMSDOS"],
-        [mingw32], [AM_CPPFLAGS="$AM_CPPPFLAGS -DUSE_CLOCK"])
+        [native], [AM_CPPFLAGS="$AM_CPPFLAGS -DMSDOS"],
+        [mingw32], [AM_CPPFLAGS="$AM_CPPFLAGS -DUSE_CLOCK"])
 
 dnl Checks for programs.
 AC_PROG_INSTALL
@@ -45,7 +45,7 @@ AC_SEARCH_LIBS([sqrt], [m])
 
 AC_CHECK_SIZEOF([long long])
 if test $ac_cv_sizeof_long_long -lt 8; then
-  AM_CPPFLAGS="$AM_CPPPFLAGS -DNO_LONG_LONG"
+  AM_CPPFLAGS="$AM_CPPFLAGS -DNO_LONG_LONG"
 fi
 
 AC_SUBST([PMX_TREE], [pmx-]pmx_version)
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog
index 085196947ec..b416f96f7b0 100644
--- a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/ChangeLog
@@ -1,7 +1,6 @@
 2012-07-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-06-WIN32 (new): Build fix for MSVC (from W32TeX).
-	Avoid the problematic prototype for isatty().
 	We pass -DMSDOS to MSVC or -DUSE_CLOCK to the MinGW compiler.
 
 2012-05-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
diff --git a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-06-WIN32 b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-06-WIN32
index c969f3aaaf7..9ae41bfb5c0 100644
--- a/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-06-WIN32
+++ b/Build/source/utils/pmx/pmx-2.6.18-PATCHES/patch-06-WIN32
@@ -1,3 +1,7 @@
+	Typedef signed and unsigned 64-bit integers for MSVC.
+	Avoid the problematic prototypes for isatty() and ungetc().
+	Avoid redefinition of max(a,b) and min(a,b).
+
 diff -ur pmx-2.6.18.orig/libf2c/f2c.h pmx-2.6.18/libf2c/f2c.h
 --- pmx-2.6.18.orig/libf2c/f2c.h	2012-05-19 18:49:12.000000000 +0200
 +++ pmx-2.6.18/libf2c/f2c.h	2012-07-11 17:17:59.000000000 +0200
@@ -45,6 +49,21 @@ diff -ur pmx-2.6.18.orig/libf2c/fio.h pmx-2.6.18/libf2c/fio.h
  extern int err__fl(int,int,char*);
  extern int xrd_SL(void);
  extern int f__putbuf(int);
+diff -ur pmx-2.6.18.orig/libf2c/getenv_.c pmx-2.6.18/libf2c/getenv_.c
+--- pmx-2.6.18.orig/libf2c/getenv_.c	2012-04-09 18:24:12.000000000 +0200
++++ pmx-2.6.18/libf2c/getenv_.c	2012-07-12 13:28:57.000000000 +0200
+@@ -1,8 +1,10 @@
+ #include "f2c.h"
+-#undef abs
+ #ifdef KR_headers
+ extern char *F77_aloc(), *getenv();
+ #else
++#undef abs
++#undef max
++#undef min
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef __cplusplus
 diff -ur pmx-2.6.18.orig/libf2c/lread.c pmx-2.6.18/libf2c/lread.c
 --- pmx-2.6.18.orig/libf2c/lread.c	2012-04-09 18:24:12.000000000 +0200
 +++ pmx-2.6.18/libf2c/lread.c	2012-07-11 17:23:48.000000000 +0200
diff --git a/Build/source/utils/pmx/pmx-2.6.18/libf2c/getenv_.c b/Build/source/utils/pmx/pmx-2.6.18/libf2c/getenv_.c
index 4c7ecd269ff..57ca28cb3b4 100644
--- a/Build/source/utils/pmx/pmx-2.6.18/libf2c/getenv_.c
+++ b/Build/source/utils/pmx/pmx-2.6.18/libf2c/getenv_.c
@@ -1,8 +1,10 @@
 #include "f2c.h"
-#undef abs
 #ifdef KR_headers
 extern char *F77_aloc(), *getenv();
 #else
+#undef abs
+#undef max
+#undef min
 #include <stdlib.h>
 #include <string.h>
 #ifdef __cplusplus