use #include <iostream> for the cxx-runtime-hack test

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

3 files changed, 318 insertions, 273 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index f2b139e347b..fff9dff3078 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-26  Karl Berry  <karl@tug.org>
+
+	* configure.in (with_cxx_runtime_hack): use
+	#include <iostream>
+	  using namespace std;
+	for the hello,world test, to placate the backward-incompatible
+	standard.
+
 2008-11-18  Karl Berry  <karl@tug.org>
 
 	* Makefile.in (install-data): mkinstalldirs man1dir man5dir.
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 4324b3fb31c..5149fecccd8 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -635,149 +635,149 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-WEB2CVERSION
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-LN_S
-SET_MAKE
-YACC
-YFLAGS
-LEX
-LEX_OUTPUT_ROOT
-LEXLIB
-RANLIB
-CPP
-GREP
-EGREP
-LD
-AR
-ARFLAGS
-socketlibs
-MAINT
-texmfmain
-ZLIBCPPFLAGS
-LDZLIB
-ZLIBDEP
-LIBPNGCPPFLAGS
-LDLIBPNG
-LIBPNGDEP
-LIBXPDFCPPFLAGS
-LDLIBXPDF
-LIBXPDFDEP
-LIBOBSDCFLAGS
-LDLIBOBSD
-LIBOBSDDEP
-FREETYPE2CPPFLAGS
-LDFREETYPE2
-FREETYPE2DEP
-TECKITCPPFLAGS
-LDTECKIT
-TECKITDEP
-ICUCPPFLAGS
-LDICU
-ICUDEP
-GRAPHITECPPFLAGS
-LDGRAPHITE
-GRAPHITEDEP
-MFN
-OMEGA
-ALEPH
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXLDEXTRA
-CXXHACKLINK
-CXXHACKLDLIBS
-PTEX
-PETEX
-LTEX
-XETEX
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-acx_pthread_config
-PTHREAD_CC
-PTHREAD_LIBS
-PTHREAD_CFLAGS
-FONTCONFIGCPPFLAGS
-FONTCONFIGLDFLAGS
-LDFONTCONFIG
-XETEX_MACOSX
-XETEX_GENERIC
-XETEX_GRAPHITE
-ETEX
-XMKMF
-X_CFLAGS
-X_PRE_LIBS
-X_LIBS
-X_EXTRA_LIBS
-x_ext_lib
-x_tool_libs
-wlibs
-FMU
-BUILDCC
-BUILDCFLAGS
-BUILDCPPFLAGS
-BUILDLDFLAGS
-BUILDCCLD
-TANGLEBOOT
-TANGLE
-CTANGLEBOOT
-CTANGLE
-TIE
-OTANGLE
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+OTANGLE
+TIE
+CTANGLE
+CTANGLEBOOT
+TANGLE
+TANGLEBOOT
+BUILDCCLD
+BUILDLDFLAGS
+BUILDCPPFLAGS
+BUILDCFLAGS
+BUILDCC
+FMU
+wlibs
+x_tool_libs
+x_ext_lib
+X_EXTRA_LIBS
+X_LIBS
+X_PRE_LIBS
+X_CFLAGS
+XMKMF
+ETEX
+XETEX_GRAPHITE
+XETEX_GENERIC
+XETEX_MACOSX
+LDFONTCONFIG
+FONTCONFIGLDFLAGS
+FONTCONFIGCPPFLAGS
+PTHREAD_CFLAGS
+PTHREAD_LIBS
+PTHREAD_CC
+acx_pthread_config
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+XETEX
+LTEX
+PETEX
+PTEX
+CXXHACKLDLIBS
+CXXHACKLINK
+CXXLDEXTRA
+ac_ct_CXX
+CXXFLAGS
+CXX
+ALEPH
+OMEGA
+MFN
+GRAPHITEDEP
+LDGRAPHITE
+GRAPHITECPPFLAGS
+ICUDEP
+LDICU
+ICUCPPFLAGS
+TECKITDEP
+LDTECKIT
+TECKITCPPFLAGS
+FREETYPE2DEP
+LDFREETYPE2
+FREETYPE2CPPFLAGS
+LIBOBSDDEP
+LDLIBOBSD
+LIBOBSDCFLAGS
+LIBXPDFDEP
+LDLIBXPDF
+LIBXPDFCPPFLAGS
+LIBPNGDEP
+LDLIBPNG
+LIBPNGCPPFLAGS
+ZLIBDEP
+LDZLIB
+ZLIBCPPFLAGS
+texmfmain
+MAINT
+socketlibs
+ARFLAGS
+AR
+LD
+EGREP
+GREP
+CPP
+RANLIB
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
+YFLAGS
+YACC
+SET_MAKE
+LN_S
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+WEB2CVERSION
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -1267,9 +1267,9 @@ fi
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
    { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1322,7 +1322,7 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
@@ -1620,7 +1620,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.62
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -1634,7 +1634,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1757,8 +1757,8 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -1961,6 +1961,8 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
   { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
@@ -2089,12 +2091,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2293,12 +2291,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2308,11 +2302,13 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -2442,11 +2438,13 @@ if test -z "$ac_file"; then
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
@@ -2474,13 +2472,15 @@ $as_echo "$ac_try_echo") >&5
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
@@ -2523,11 +2523,13 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
@@ -2581,11 +2583,13 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -3446,12 +3450,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -3681,11 +3681,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -4068,8 +4070,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4216,8 +4219,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
 $as_echo "$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4325,8 +4329,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -4651,7 +4656,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_sigemptyset" >&5
 $as_echo "$ac_cv_lib_posix_sigemptyset" >&6; }
-if test $ac_cv_lib_posix_sigemptyset = yes; then
+if test "x$ac_cv_lib_posix_sigemptyset" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPOSIX 1
 _ACEOF
@@ -4739,15 +4744,15 @@ if test "${ac_cv_c_bigendian+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
-    # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
-       cat >conftest.$ac_ext <<_ACEOF
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
-	       neither is defined;
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
 	     #endif
 	     typedef int dummy;
 
@@ -4770,7 +4775,13 @@ $as_echo "$ac_try_echo") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_c_bigendian=universal
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -5118,7 +5129,12 @@ _ACEOF
    no)
       ;; #(
    universal)
-      ;; #(
+
+cat >>confdefs.h <<\_ACEOF
+#define AC_APPLE_UNIVERSAL_BUILD 1
+_ACEOF
+
+     ;; #(
    *)
      { { $as_echo "$as_me:$LINENO: error: unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" >&5
@@ -5378,11 +5394,13 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_long=0
    fi ;;
@@ -5458,11 +5476,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -5731,7 +5751,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
 $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test $ac_cv_lib_socket_connect = yes; then
+if test "x$ac_cv_lib_socket_connect" = x""yes; then
   socketlibs="-lsocket $socketlibs"
 fi
 
@@ -6237,7 +6257,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
 $as_echo "$ac_cv_lib_z_inflate" >&6; }
-if test $ac_cv_lib_z_inflate = yes; then
+if test "x$ac_cv_lib_z_inflate" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
@@ -6388,8 +6408,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
 $as_echo "$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -6517,7 +6538,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5
 $as_echo "$ac_cv_lib_png_png_set_read_fn" >&6; }
-if test $ac_cv_lib_png_png_set_read_fn = yes; then
+if test "x$ac_cv_lib_png_png_set_read_fn" = x""yes; then
   pnglib=-lpng
 else
   { $as_echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
@@ -6689,7 +6710,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
-if test $ac_cv_lib_freetype_FT_Init_FreeType = yes; then
+if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBFREETYPE 1
 _ACEOF
@@ -6840,8 +6861,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
 $as_echo "$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7003,7 +7025,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_icuuc_ubidi_open" >&5
 $as_echo "$ac_cv_lib_icuuc_ubidi_open" >&6; }
-if test $ac_cv_lib_icuuc_ubidi_open = yes; then
+if test "x$ac_cv_lib_icuuc_ubidi_open" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBICUUC 1
 _ACEOF
@@ -7154,8 +7176,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'}
 $as_echo "$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7423,12 +7446,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -7800,12 +7819,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -8096,11 +8111,12 @@ $as_echo "$as_me: WARNING: No C++ compiler: XeTeX will not be compiled." >&2;}
 }
 fi
 
-# Check if we can link the C++ runlime lib statically. Only check, if we are
-# going to build pdf[ex]tex. And, only try the magic hack, if C++ is
-# GNU C++ (i.e. if $ac_cv_prog_gxx=yes). The reason for using a static C++
-# runtime is that binaries are more portable. That's only important if you are
-# planning to distribute binaries, so all the neat stuff is disabled by default:
+# Check if we can link the C++ runtime lib statically, if we're building
+# some binary that will need it. And, only try the magic hack, if C++ is
+# GNU C++ (i.e. if $ac_cv_prog_gxx=yes). The reason for using a static
+# C++ runtime is that binaries are more portable. That's important only
+# if you are distributing binaries, so it is disabled by default.
+#
 flags_try1='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm -lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
 flags_try2='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm -lgcc -lc -lgcc'
 CXXLDEXTRA=
@@ -8121,15 +8137,19 @@ $as_echo_n "checking for statically linking C++ runtime library... " >&6; }
   old_ac_link=$ac_link
   if test "$ac_cv_cxx_compiler_gnu" = yes; then
 
+    # New C++ compilers choke on <iostream.h>, thanks to the
+    # backward-incompatible standard.  At this point, our code is
+    # using the new-style <iostream>, and so our test should follow suit.
+    #
     ac_ext=C
     cat > conftest.$ac_ext << EOF
-#include <iostream.h>
+#include <iostream>
+  using namespace std;
 int main()
 {
   cout <<"worksok\n";
 }
 EOF
-
     for flags in "$flags_try1" "$flags_try2"; do
       ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS $flags 1>&5'
       if { (eval echo configure: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -9029,7 +9049,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcInit" >&5
 $as_echo "$ac_cv_lib_fontconfig_FcInit" >&6; }
-if test $ac_cv_lib_fontconfig_FcInit = yes; then
+if test "x$ac_cv_lib_fontconfig_FcInit" = x""yes; then
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -9123,8 +9143,8 @@ if test "x$with_x" = xno; then
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
+    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
+$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
    { (exit 1); exit 1; }; };; #(
     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
   $as_echo_n "(cached) " >&6
@@ -9162,7 +9182,7 @@ _ACEOF
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -9602,7 +9622,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
@@ -9672,7 +9692,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
@@ -9844,7 +9864,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
@@ -9914,7 +9934,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -10080,7 +10100,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
 $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test $ac_cv_lib_socket_connect = yes; then
+if test "x$ac_cv_lib_socket_connect" = x""yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
@@ -10239,7 +10259,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
 $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test $ac_cv_lib_posix_remove = yes; then
+if test "x$ac_cv_lib_posix_remove" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
@@ -10398,7 +10418,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test $ac_cv_lib_ipc_shmat = yes; then
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -10479,7 +10499,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -10560,7 +10580,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 $as_echo "$ac_cv_lib_Xext_XextCreateExtension" >&6; }
-if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
+if test "x$ac_cv_lib_Xext_XextCreateExtension" = x""yes; then
   x_ext_lib=-lXext
 else
   :
@@ -10678,7 +10698,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
 $as_echo "$ac_cv_lib_m_main" >&6; }
-if test $ac_cv_lib_m_main = yes; then
+if test "x$ac_cv_lib_m_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -11129,8 +11149,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -11200,6 +11220,7 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
+
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -11522,7 +11543,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -11535,6 +11556,15 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
@@ -11547,16 +11577,17 @@ ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
+      --file=FILE[:TEMPLATE]
                    instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
+      --header=FILE[:TEMPLATE]
                    instantiate the configuration header FILE
 
 Configuration files:
@@ -11571,7 +11602,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.62,
+configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11791,7 +11822,8 @@ for ac_last_try in false false false false false :; do
 $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -11996,9 +12028,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   }
   split(mac1, mac2, "(") #)
   macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
     # Preserve the white space surrounding the "#".
-    prefix = substr(line, 1, index(line, defundef) - 1)
     print prefix "define", macro P[macro] D[macro]
     next
   } else {
@@ -12006,7 +12038,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     # in the case of _POSIX_SOURCE, which is predefined and required
     # on some systems where configure will not decide to define it.
     if (defundef == "undef") {
-      print "/*", line, "*/"
+      print "/*", prefix defundef, macro, "*/"
       next
     }
   }
@@ -12030,8 +12062,8 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -12391,7 +12423,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > omegafonts/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > omegafonts/Makefile.aux
  ;;
     "otps/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case otps/Makefile.in in
@@ -12461,7 +12493,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > otps/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > otps/Makefile.aux
  ;;
     "pdftexdir/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case pdftexdir/Makefile.in in
@@ -12531,7 +12563,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > pdftexdir/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > pdftexdir/Makefile.aux
  ;;
     "luatexdir/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case luatexdir/Makefile.in in
@@ -12601,7 +12633,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > luatexdir/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > luatexdir/Makefile.aux
  ;;
     "Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case Makefile.in in
@@ -12671,7 +12703,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > Makefile.aux
  ;;
     "doc/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case doc/Makefile.in in
@@ -12741,7 +12773,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > doc/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > doc/Makefile.aux
  ;;
     "lib/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case lib/Makefile.in in
@@ -12811,7 +12843,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > lib/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > lib/Makefile.aux
  ;;
     "man/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case man/Makefile.in in
@@ -12881,7 +12913,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > man/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > man/Makefile.aux
  ;;
     "mpware/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case mpware/Makefile.in in
@@ -12951,7 +12983,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > mpware/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > mpware/Makefile.aux
  ;;
     "mpdir/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case mpdir/Makefile.in in
@@ -13021,7 +13053,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > mpdir/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > mpdir/Makefile.aux
  ;;
     "web2c/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case web2c/Makefile.in in
@@ -13091,7 +13123,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > web2c/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > web2c/Makefile.aux
  ;;
     "window/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case window/Makefile.in in
@@ -13161,7 +13193,7 @@ done
 # ... and fix the whitespace and escaped slashes.
 kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
   -e 's/kpse_include /kpse_include[ 	]*/g'`
-(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > window/Makefile.aux
+(eval $kpse_substs -e '"/^kpse_include/d"' "$kpse_input") > window/Makefile.aux
  ;;
 
   esac
@@ -13200,7 +13232,7 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/Build/source/texk/web2c/configure.in b/Build/source/texk/web2c/configure.in
index cdc50590d8e..d1034db49ad 100644
--- a/Build/source/texk/web2c/configure.in
+++ b/Build/source/texk/web2c/configure.in
@@ -221,11 +221,12 @@ then
 }
 fi
 
-# Check if we can link the C++ runlime lib statically. Only check, if we are
-# going to build pdf[ex]tex. And, only try the magic hack, if C++ is
-# GNU C++ (i.e. if $ac_cv_prog_gxx=yes). The reason for using a static C++
-# runtime is that binaries are more portable. That's only important if you are
-# planning to distribute binaries, so all the neat stuff is disabled by default:
+# Check if we can link the C++ runtime lib statically, if we're building
+# some binary that will need it. And, only try the magic hack, if C++ is
+# GNU C++ (i.e. if $ac_cv_prog_gxx=yes). The reason for using a static
+# C++ runtime is that binaries are more portable. That's important only
+# if you are distributing binaries, so it is disabled by default.
+# 
 flags_try1='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm -lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
 flags_try2='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm -lgcc -lc -lgcc'
 CXXLDEXTRA=
@@ -245,15 +246,19 @@ then
   old_ac_link=$ac_link
   if test "$ac_cv_prog_gxx" = yes; then
 
+    # New C++ compilers choke on <iostream.h>, thanks to the
+    # backward-incompatible standard.  At this point, our code is
+    # using the new-style <iostream>, and so our test should follow suit.
+    # 
     ac_ext=C
     cat > conftest.$ac_ext << EOF
-#include <iostream.h>
+#include <iostream>
+  using namespace std;
 int main()
 {
   cout <<"worksok\n";
 }
 EOF
-
     for flags in "$flags_try1" "$flags_try2"; do
       ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS $flags 1>&5'
       if { (eval echo configure: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then