build system: Minor cleanup

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

7 files changed, 7 insertions, 155 deletions

diff --git a/Build/source/texk/dvipdf-x/ChangeLog b/Build/source/texk/dvipdf-x/ChangeLog
index b652d9641bb..94ceaf204b8 100644
--- a/Build/source/texk/dvipdf-x/ChangeLog
+++ b/Build/source/texk/dvipdf-x/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Drop the useless KPSE_LT_HACK.
+	Drop the redundant AC_HEADER_STDC and check for mkstemp.
+
 2013-09-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* spc_xtx.c, xsrc/dpxutil.[ch], xsrc/dvipdfmx.c, xsrc/epdf.[ch],
diff --git a/Build/source/texk/dvipdf-x/Makefile.in b/Build/source/texk/dvipdf-x/Makefile.in
index 9e9837f718d..4e48af69b66 100644
--- a/Build/source/texk/dvipdf-x/Makefile.in
+++ b/Build/source/texk/dvipdf-x/Makefile.in
@@ -118,7 +118,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-libpaper.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
diff --git a/Build/source/texk/dvipdf-x/aclocal.m4 b/Build/source/texk/dvipdf-x/aclocal.m4
index a0babfe9e96..c1337a226aa 100644
--- a/Build/source/texk/dvipdf-x/aclocal.m4
+++ b/Build/source/texk/dvipdf-x/aclocal.m4
@@ -1225,7 +1225,6 @@ m4_include([../../m4/kpse-freetype2-flags.m4])
 m4_include([../../m4/kpse-kpathsea-flags.m4])
 m4_include([../../m4/kpse-libpaper.m4])
 m4_include([../../m4/kpse-libpng-flags.m4])
-m4_include([../../m4/kpse-lt-hack.m4])
 m4_include([../../m4/kpse-warnings.m4])
 m4_include([../../m4/kpse-win32.m4])
 m4_include([../../m4/kpse-zlib-flags.m4])
diff --git a/Build/source/texk/dvipdf-x/configure b/Build/source/texk/dvipdf-x/configure
index 472df4e0ab3..1c84299de82 100755
--- a/Build/source/texk/dvipdf-x/configure
+++ b/Build/source/texk/dvipdf-x/configure
@@ -798,7 +798,6 @@ enable_libtool_lock
 enable_largefile
 enable_dvipdf
 enable_xdvipdf
-enable_libtool_hack
 with_system_kpathsea
 with_kpathsea_includes
 with_kpathsea_libdir
@@ -1457,7 +1456,6 @@ Optional Features:
   --disable-largefile     omit support for large files
   --disable-dvipdf        do not build the dvipdf program
   --disable-xdvipdf       do not build the xdvipdf program
-  --enable-libtool-hack   ignore libtool dependency_libs
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -13219,128 +13217,6 @@ test "x$enable_dvipdf_x:$enable_xdvipdf" = xyes:yes && need_freetype2=yes
 ac_config_headers="$ac_config_headers config.h"
 
 
-# Check whether --enable-libtool-hack was given.
-if test "${enable_libtool_hack+set}" = set; then :
-  enableval=$enable_libtool_hack;
-fi
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
 for ac_header in unistd.h stdint.h inttypes.h sys/types.h sys/wait.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13417,7 +13293,7 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
 esac
 
 
-for ac_func in open close getenv mkstemp basename
+for ac_func in open close getenv 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"
@@ -14703,7 +14579,6 @@ fi
     RM='$RM'
     ofile='$ofile'
 
-enable_libtool_hack='$enable_libtool_hack'
 
 
 _LTEOF
@@ -15343,16 +15218,6 @@ fi
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
-## KPSE_LT_HACK: Prevent libtool from linking dependency_libs
-if test "x$enable_libtool_hack" = xyes; then
-  $SED '/# Convert "-framework/i\
-	## KPSE_LT_HACK: ignore dependency_libs\
-	test "X$installed" = Xyes && dependency_libs=\
-' "$ofile" >"$cfgfile"
-  mv "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-fi
 
 as_fn_exit 0
 _LTEOF
@@ -17071,7 +16936,6 @@ fi
     RM='$RM'
     ofile='$ofile'
 
-enable_libtool_hack='$enable_libtool_hack'
 ac_aux_dir='$ac_aux_dir'
 
 
@@ -18443,16 +18307,6 @@ fi
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
-## KPSE_LT_HACK: Prevent libtool from linking dependency_libs
-if test "x$enable_libtool_hack" = xyes; then
-  $SED '/# Convert "-framework/i\
-	## KPSE_LT_HACK: ignore dependency_libs\
-	test "X$installed" = Xyes && dependency_libs=\
-' "$ofile" >"$cfgfile"
-  mv "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-fi
  ;;
 
   esac
diff --git a/Build/source/texk/dvipdf-x/configure.ac b/Build/source/texk/dvipdf-x/configure.ac
index 4132c5048b0..a481621cd3e 100644
--- a/Build/source/texk/dvipdf-x/configure.ac
+++ b/Build/source/texk/dvipdf-x/configure.ac
@@ -19,15 +19,12 @@ m4_include([ac/dvipdf-x.ac])
 
 AC_CONFIG_HEADERS([config.h])
 
-KPSE_LT_HACK
-
 dnl Checks for header files.
-AC_HEADER_STDC
 AC_CHECK_HEADERS([unistd.h stdint.h inttypes.h sys/types.h sys/wait.h])
 
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([open close getenv mkstemp basename])
+AC_CHECK_FUNCS([open close getenv basename])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM
diff --git a/Build/source/texk/dvipdf-x/data/Makefile.in b/Build/source/texk/dvipdf-x/data/Makefile.in
index b4c95e868f4..49f81b59b2c 100644
--- a/Build/source/texk/dvipdf-x/data/Makefile.in
+++ b/Build/source/texk/dvipdf-x/data/Makefile.in
@@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-libpaper.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
diff --git a/Build/source/texk/dvipdf-x/man/Makefile.in b/Build/source/texk/dvipdf-x/man/Makefile.in
index cd6f58f4e01..e3558f7e5c6 100644
--- a/Build/source/texk/dvipdf-x/man/Makefile.in
+++ b/Build/source/texk/dvipdf-x/man/Makefile.in
@@ -86,7 +86,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-libpaper.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \