dvipdfmx: more compiler warning

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

7 files changed, 35 insertions, 123 deletions

diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 4fbb2e4b191..be4f72c0fe1 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Check for sys/wait.h, in order to define
+	HAVE_SYS_WAIT_H (required for src/dpxfile.c).
+
 2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac: Proxy build system for TeX Live,
diff --git a/Build/source/texk/dvipdfmx/config.h.in b/Build/source/texk/dvipdfmx/config.h.in
index 242ad2b9da8..04308cf405c 100644
--- a/Build/source/texk/dvipdfmx/config.h.in
+++ b/Build/source/texk/dvipdfmx/config.h.in
@@ -62,9 +62,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define if you have libpaper */
-#undef HAVE_LIBPAPER
-
 /* Define if you have libpng and its headers. */
 #undef HAVE_LIBPNG
 
@@ -137,9 +134,6 @@
 /* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
-/* Define to 1 if you have the `system' function. */
-#undef HAVE_SYSTEM
-
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 #undef HAVE_SYS_DIR_H
@@ -157,6 +151,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#undef HAVE_SYS_WAIT_H
+
 /* Define if <time.h> has timezone as an external variable. */
 #undef HAVE_TIMEZONE
 
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index 2808ca0b2e9..6644e00e5d0 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -765,7 +765,6 @@ with_system_zlib
 with_zlib_includes
 with_zlib_libdir
 with_system_libpng
-with_paper
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1430,7 +1429,6 @@ Optional Packages:
   --with-zlib-libdir=DIR  zlib library installed in DIR
   --with-system-libpng    use installed libpng headers and library (requires
                           pkg-config)
-  --with-paper=DIR        use paper include/library files from DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -12866,7 +12864,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
-for ac_header in stdint.h inttypes.h sys/types.h
+for ac_header in stdint.h inttypes.h sys/types.h sys/wait.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -12942,7 +12940,7 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
 esac
 
 
-for ac_func in open close system getenv mkstemp basename
+for ac_func in open close getenv mkstemp basename
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15143,6 +15141,9 @@ fi
 
 
 
+$as_echo "#define __TDS_VERSION__ 0x200406L" >>confdefs.h
+
+
 eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\"
 eval LIBS=\"$ZLIB_LIBS \$LIBS\"
 
@@ -15255,106 +15256,6 @@ LIBS=$kpse_save_LIBS
 echo timestamp >config.force
 fi
 
-
-$as_echo "#define __TDS_VERSION__ 0x200406L" >>confdefs.h
-
-
-
-if test "x$enable_texlive_build" != xyes || test ! -d $srdir/../kpathsea; then
-  _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
-
-# Check whether --with-paper was given.
-if test "${with_paper+set}" = set; then :
-  withval=$with_paper; if test -d "$withval"; then
-     CPPFLAGS="$CPPFLAGS -I$withval/include"
-     LDFLAGS="$LDFLAGS -L$withval/lib"
-   fi
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for paper header files" >&5
-$as_echo_n "checking for paper header files... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <paper.h>
-int
-main ()
-{
-struct paper *p;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing paperpswidth" >&5
-$as_echo_n "checking for library containing paperpswidth... " >&6; }
-if ${ac_cv_search_paperpswidth+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char paperpswidth ();
-int
-main ()
-{
-return paperpswidth ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' paper; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_paperpswidth=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_paperpswidth+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_paperpswidth+:} false; then :
-
-else
-  ac_cv_search_paperpswidth=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_paperpswidth" >&5
-$as_echo "$ac_cv_search_paperpswidth" >&6; }
-ac_res=$ac_cv_search_paperpswidth
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h
-
-fi
-
-else
-  CPPFLAGS=$_cppflags
-   LDDFLAGS=$_ldflags
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-
 DVIPDFMX_TREE=dvipdfmx-20110305
 
 
diff --git a/Build/source/texk/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac
index c09ce7e74c6..1efa1236137 100644
--- a/Build/source/texk/dvipdfmx/configure.ac
+++ b/Build/source/texk/dvipdfmx/configure.ac
@@ -20,11 +20,11 @@ AC_CONFIG_HEADERS([config.h])
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stdint.h inttypes.h sys/types.h])
+AC_CHECK_HEADERS([stdint.h inttypes.h sys/types.h sys/wait.h])
 
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([open close system getenv mkstemp basename])
+AC_CHECK_FUNCS([open close getenv mkstemp basename])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM
@@ -59,6 +59,8 @@ if test "x$enable_build" != xno || test -f config.force; then
 KPSE_ADD_FLAGS([kpathsea])
 AC_CHECK_HEADER([kpathsea/version.h], [],
                 [AC_MSG_ERROR([Sorry, kpathsea too old])])
+AC_DEFINE([__TDS_VERSION__], [0x200406L],
+          [Define to 0x200406L if your libkpathsea supports enc formats.])
 
 KPSE_ADD_FLAGS([zlib])
 CHO_CHECK_ZLIB
@@ -71,16 +73,6 @@ KPSE_RESTORE_FLAGS
 echo timestamp >config.force
 fi
 
-dnl We always have this in TeX Live
-AC_DEFINE([__TDS_VERSION__], [0x200406L],
-          [Define to 0x200406L if your libkpathsea supports enc formats.])
-
-dnl Check for additional libraries.
-
-if test "x$enable_texlive_build" != xyes || test ! -d $srdir/../kpathsea; then
-  CHO_CHECK_LIBPAPER
-fi
-
 AC_SUBST([DVIPDFMX_TREE], [dvipdfmx-]dvipdfmx_version)
 
 KPSE_CHECK_WIN32
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110305-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110305-PATCHES/ChangeLog
index 0bbe5a83817..14248ea1044 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110305-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110305-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-03-sys_wait_h (new): Check for sys/wait.h, in order to
+	define HAVE_SYS_WAIT_H (required for src/dpxfile.c).
+
 2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported snapshot 20110305.
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110305-PATCHES/patch-03-sys_wait_h b/Build/source/texk/dvipdfmx/dvipdfmx-20110305-PATCHES/patch-03-sys_wait_h
new file mode 100644
index 00000000000..8c797c111f8
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110305-PATCHES/patch-03-sys_wait_h
@@ -0,0 +1,12 @@
+diff -ur dvipdfmx-20110305.orig/configure.in dvipdfmx-20110305/configure.in
+--- dvipdfmx-20110305.orig/configure.in	2011-03-05 06:30:10.000000000 +0100
++++ dvipdfmx-20110305/configure.in	2011-03-07 20:34:53.000000000 +0100
+@@ -79,7 +79,7 @@
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(unistd.h)
+-AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h)
++AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h sys/wait.h)
+ 
+ dnl Checks for library functions.
+ AC_FUNC_MEMCMP
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110305/configure.in b/Build/source/texk/dvipdfmx/dvipdfmx-20110305/configure.in
index 5d8a73cd3e6..0ca6c72108e 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110305/configure.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110305/configure.in
@@ -79,7 +79,7 @@ fi
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h)
+AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h sys/wait.h)
 
 dnl Checks for library functions.
 AC_FUNC_MEMCMP