initial attempt at luatex build

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

33 files changed, 5090 insertions, 6741 deletions

diff --git a/Build/source/README b/Build/source/README
index f0a45438ecb..41ed23d105d 100644
--- a/Build/source/README
+++ b/Build/source/README
@@ -10,6 +10,9 @@ To make without configuring, run TL_CONFIGURE=true ./Build.
 environment variables; just take a look to see all the names.)
 
 Prerequisites:
+- GNU make.  If your GNU make is invoked by some name other than `make',
+  try setting the envvar TL_MAKE to what is needed.
+
 - GNU clisp and GNU libffcall, must be present for xindy.  See more
   details in utils/README.  (Alternative: Build --without-xindy.)
 
diff --git a/Build/source/configure b/Build/source/configure
index 5f3dfad7dcd..2ede4e48c6d 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.62.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -614,6 +636,7 @@ ac_includes_default="\
 #endif"
 
 ac_default_prefix=/usr/local/teTeX
+enable_option_checking=no
 ac_subst_vars='SHELL
 PATH_SEPARATOR
 PACKAGE_NAME
@@ -741,6 +764,113 @@ INSTDIRS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_x
+enable_multiplatform
+with_dialog
+with_pdfopen
+with_ps2eps
+with_psutils
+with_t1utils
+with_texinfo
+with_tpic2pdftex
+with_xindy
+with_afm2pl
+with_bibtex8
+with_cjkutils
+with_detex
+with_devnag
+with_dtl
+with_dvi2tty
+with_dvidvi
+with_dviljk
+with_dvipdfm
+with_dvipdfmx
+with_dvipng
+with_dvipos
+with_dvipsk
+with_gsftopk
+with_lacheck
+with_lcdf_typetools
+with_makeindexk
+with_musixflx
+with_ps2pkm
+with_seetexk
+with_tetex
+with_tex4htk
+with_texlive
+with_ttf2pk
+with_xdv2pdf
+with_xdvik
+with_xdvipdfmx
+with_x_toolkit
+enable_maintainer_mode
+with_mktexmf_default
+with_mktexpk_default
+with_mktextfm_default
+with_mkocp_default
+with_mkofm_default
+with_mktexfmt_default
+with_mktextex_default
+with_etex
+with_omega
+with_aleph
+with_pdftex
+with_pdfetex
+with_luatex
+with_xetex
+with_cxx_runtime_hack
+with_editor
+enable_ipc
+enable_auto_core
+enable_dump_share
+enable_fmtutil
+with_mf_nowin
+with_epsfwin
+with_hp2627win
+with_mftalkwin
+with_nextwin
+with_regiswin
+with_suntoolswin
+with_tektronixwin
+with_unitermwin
+with_x11win
+with_x11
+with_mf_x_toolkit
+with_fontconfig
+with_ps
+enable_grey
+enable_color
+enable_t1lib
+enable_gf
+enable_a4
+enable_magick
+with_xdvi_x_toolkit
+with_system_ncurses
+with_ncurses_libdir
+with_ncurses_include
+with_system_zlib
+with_zlib_libdir
+with_zlib_include
+with_system_pnglib
+with_pnglib_libdir
+with_pnglib_include
+with_system_t1lib
+with_t1lib_libdir
+with_t1lib_include
+with_system_freetype
+with_freetype_libdir
+with_freetype_include
+with_system_freetype2
+with_freetype2_libdir
+with_freetype2_include
+with_system_gd
+with_gd_libdir
+with_gd_include
+with_icu_libdir
+with_icu_include
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -770,6 +900,8 @@ texk'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -868,13 +1000,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -887,13 +1027,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1084,22 +1232,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1119,7 +1283,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1128,16 +1292,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1146,22 +1310,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+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
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1176,7 +1356,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1192,10 +1372,10 @@ 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 .` ||
-  { 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" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1203,12 +1383,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1235,12 +1415,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1289,9 +1469,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1301,25 +1481,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1340,6 +1520,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-multiplatform  put executables into bin/PLATFORM and libraries into
@@ -1414,6 +1595,7 @@ Optional Packages:
   --without-aleph            don't compile and install Aleph
   --without-pdftex           don't compile and install pdfTeX
   --without-pdfetex          don't compile and install pdfeTeX
+  --without-luatex           don't compile and install pdfTeX
   --without-xetex            don't compile and install XeTeX
   --with-cxx-runtime-hack    link C++ runtime statically
   --with-editor=CMD       invoke CMD from the e option vi +%d %s
@@ -1503,15 +1685,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1547,7 +1731,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1557,10 +1741,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1571,7 +1755,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.61.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1607,7 +1791,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1642,7 +1826,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1694,11 +1878,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-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) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1728,9 +1913,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1745,9 +1930,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1763,8 +1948,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1806,21 +1991,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1830,16 +2018,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1853,29 +2041,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1885,10 +2082,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&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
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1933,8 +2130,8 @@ for ac_dir in config "$srcdir"/config; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1947,11 +2144,12 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -1968,12 +2166,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1985,10 +2183,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2001,7 +2199,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2012,11 +2210,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2025,10 +2223,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2041,7 +2239,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2052,11 +2250,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2064,10 +2262,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -2082,10 +2280,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2098,7 +2296,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2109,11 +2307,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2122,10 +2320,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2143,7 +2341,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2166,11 +2364,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2181,10 +2379,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2197,7 +2395,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2208,11 +2406,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2225,10 +2423,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2241,7 +2439,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2252,11 +2450,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2268,10 +2466,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -2283,44 +2481,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2339,27 +2541,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2370,10 +2567,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2384,7 +2582,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2411,15 +2609,15 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
@@ -2428,8 +2626,8 @@ ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2438,49 +2636,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $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
-echo "$as_me: error: cannot run C compiled programs.
+$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; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2489,31 +2689,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$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; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2536,40 +2736,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2595,20 +2796,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2618,15 +2820,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2653,20 +2859,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2691,20 +2898,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2730,20 +2938,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2758,8 +2967,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2775,10 +2984,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -2849,20 +3058,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2878,15 +3088,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -2910,10 +3120,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -2926,7 +3136,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2937,11 +3147,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2954,10 +3164,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -2970,7 +3180,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2981,11 +3191,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2997,10 +3207,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -3012,43 +3222,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3074,20 +3288,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3097,15 +3312,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -3132,20 +3351,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -3170,20 +3390,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -3209,20 +3430,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3237,8 +3459,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -3266,10 +3488,10 @@ for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_LEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -3282,7 +3504,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LEX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3293,11 +3515,11 @@ fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  { echo "$as_me:$LINENO: result: $LEX" >&5
-echo "${ECHO_T}$LEX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3330,15 +3552,16 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ echo "$as_me:$LINENO: checking lex output file root" >&5
-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
 if test "${ac_cv_prog_lex_root+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test -f lex.yy.c; then
@@ -3346,20 +3569,20 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 if test -z "${LEXLIB+set}"; then
-  { echo "$as_me:$LINENO: checking lex library" >&5
-echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
 if test "${ac_cv_lib_lex+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     ac_save_LIBS=$LIBS
@@ -3375,26 +3598,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_lex=$ac_lib
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       test "$ac_cv_lib_lex" != 'none needed' && break
@@ -3402,16 +3629,16 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     LIBS=$ac_save_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
 # default is implementation-dependent.  Figure out which it is, since
@@ -3429,33 +3656,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3480,8 +3711,8 @@ case $LEX in
   ;;
 esac
 if $foundLEX; then :; else
-  { { echo "$as_me:$LINENO: error: no working lexical scanner (lex/flex) found" >&5
-echo "$as_me: error: no working lexical scanner (lex/flex) found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: no working lexical scanner (lex/flex) found" >&5
+$as_echo "$as_me: error: no working lexical scanner (lex/flex) found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -3489,10 +3720,10 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3505,7 +3736,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3516,11 +3747,11 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3542,41 +3773,41 @@ case $YACC in
   ;;
 esac
 if $foundYACC; then :; else
-  { { echo "$as_me:$LINENO: error: no working parser generator (yacc/bison) found" >&5
-echo "$as_me: error: no working parser generator (yacc/bison) found" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: no working parser generator (yacc/bison) found" >&5
+$as_echo "$as_me: error: no working parser generator (yacc/bison) found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -3593,27 +3824,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -3630,27 +3861,27 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
 if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
@@ -3674,39 +3905,39 @@ test -n "$target_alias" &&
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
-{ echo "$as_me:$LINENO: checking whether to define additional compiler specific flags" >&5
-echo $ECHO_N "checking whether to define additional compiler specific flags... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to define additional compiler specific flags" >&5
+$as_echo_n "checking whether to define additional compiler specific flags... " >&6; }
 case "$target" in
     alpha*-dec*)
         if test "$CC" = "cc"; then
           CFLAGS="$CFLAGS -Olimit 1000 -std1"; export CFLAGS
-          { echo "$as_me:$LINENO: WARNING: Digital Unix's cc" >&5
-echo "$as_me: WARNING: Digital Unix's cc" >&2;}
+          { $as_echo "$as_me:$LINENO: WARNING: Digital Unix's cc" >&5
+$as_echo "$as_me: WARNING: Digital Unix's cc" >&2;}
         fi
         ;;
     hp*hpux*)
         if test "$CC" = "cc"; then
           CFLAGS="$CFLAGS -Aa +e -D_HPUX_SOURCE"; export CFLAGS
-          { echo "$as_me:$LINENO: WARNING: HP-UX's cc" >&5
-echo "$as_me: WARNING: HP-UX's cc" >&2;}
+          { $as_echo "$as_me:$LINENO: WARNING: HP-UX's cc" >&5
+$as_echo "$as_me: WARNING: HP-UX's cc" >&2;}
         fi
         ;;
     *-darwin*)
         : ${INSTALL='/usr/bin/install -c -p'}; export INSTALL
         : ${NCURSES_CPP_FIX=true}; export NCURSES_CPP_FIX
-        { echo "$as_me:$LINENO: result: no, but using other fixes for Darwin" >&5
-echo "${ECHO_T}no, but using other fixes for Darwin" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no, but using other fixes for Darwin" >&5
+$as_echo "no, but using other fixes for Darwin" >&6; }
         ;;
     *)
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
         ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3739,20 +3970,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_sys_wait_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_sys_wait_h=no
@@ -3760,8 +3992,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3784,11 +4016,12 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3817,17 +4050,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -3840,8 +4085,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3851,11 +4096,12 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -3872,24 +4118,24 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 ac_ext=c
@@ -3897,15 +4143,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3937,20 +4183,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3974,13 +4221,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3988,7 +4236,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4013,8 +4261,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4042,20 +4290,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4079,13 +4328,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4093,7 +4343,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4109,9 +4359,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4123,42 +4373,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4173,74 +4418,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4255,40 +4486,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4315,20 +4537,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4420,37 +4643,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4472,11 +4698,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4494,20 +4720,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4515,12 +4742,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+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
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4530,10 +4759,10 @@ done
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
 if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4557,31 +4786,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_working_alloca_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_working_alloca_h=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4590,10 +4823,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
 if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4637,31 +4870,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_alloca_works=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_alloca_works=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
@@ -4682,10 +4919,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
 if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4709,15 +4946,15 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4770,33 +5007,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -4808,10 +5051,10 @@ fi
   done
 fi
 
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
 if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
@@ -4849,36 +5092,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_stack_direction=-1
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
@@ -4890,10 +5136,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -4906,7 +5152,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4917,11 +5163,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4930,10 +5176,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -4946,7 +5192,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4957,11 +5203,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -4969,10 +5215,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -4983,8 +5229,8 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-{ echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
 
 
 # Check whether --with-x was given.
@@ -4998,11 +5244,11 @@ if test "x$with_x" = xno; then
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
@@ -5023,7 +5269,7 @@ _ACEOF
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib la dll; do
       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
@@ -5098,13 +5344,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -5112,7 +5359,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
@@ -5153,30 +5400,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
+  for ac_extension in a so sl dylib la dll; do
     if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
@@ -5185,6 +5435,7 @@ do
 done
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
@@ -5207,8 +5458,8 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
@@ -5218,8 +5469,8 @@ else
   ac_cv_have_x="have_x=yes\
 	ac_x_includes='$x_includes'\
 	ac_x_libraries='$x_libraries'"
-  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
 
@@ -5303,8 +5554,8 @@ case "$build" in
       /bin/sh|"")
         if test -f /bin/ksh; then
           CONFIG_SHELL=/bin/ksh; export CONFIG_SHELL
-          { echo "$as_me:$LINENO: WARNING: Using /bin/ksh as new CONFIG_SHELL" >&5
-echo "$as_me: WARNING: Using /bin/ksh as new CONFIG_SHELL" >&2;}
+          { $as_echo "$as_me:$LINENO: WARNING: Using /bin/ksh as new CONFIG_SHELL" >&5
+$as_echo "$as_me: WARNING: Using /bin/ksh as new CONFIG_SHELL" >&2;}
         fi;;
     esac;;
 esac
@@ -5522,9 +5773,9 @@ fi
 # Check whether --with-x-toolkit was given.
 if test "${with_x_toolkit+set}" = set; then
   withval=$with_x_toolkit;
-    { echo "$as_me:$LINENO: WARNING: the --with-x-toolkit option is obsolete; please use --with-mf-x-toolkit
+    { $as_echo "$as_me:$LINENO: WARNING: the --with-x-toolkit option is obsolete; please use --with-mf-x-toolkit
 and/or --with-xdvi-x-toolkit instead. (Assuming default toolkit.)" >&5
-echo "$as_me: WARNING: the --with-x-toolkit option is obsolete; please use --with-mf-x-toolkit
+$as_echo "$as_me: WARNING: the --with-x-toolkit option is obsolete; please use --with-mf-x-toolkit
 and/or --with-xdvi-x-toolkit instead. (Assuming default toolkit.)" >&2;}
     with_xdvi_x_toolkit=yes
     with_mf_x_toolkit=yes
@@ -5533,8 +5784,8 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -5542,8 +5793,8 @@ else
   USE_MAINTAINER_MODE=no
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
   if test "x$USE_MAINTAINER_MODE" = xyes; then
     MAINT=
   else
@@ -5552,10 +5803,10 @@ echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
 
 
 
-{ echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
-echo $ECHO_N "checking for loader (symbol LD)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
+$as_echo_n "checking for loader (symbol LD)... " >&6; }
 if test "${cf_cv_subst_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$LD" && LD=ld
@@ -5563,14 +5814,14 @@ cf_cv_subst_LD=$LD
 fi
 
 LD=${cf_cv_subst_LD}
-{ echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
-echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
+$as_echo_n "checking for archiver (symbol AR)... " >&6; }
 if test "${cf_cv_subst_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$AR" && AR=ar
@@ -5578,14 +5829,14 @@ cf_cv_subst_AR=$AR
 fi
 
 AR=${cf_cv_subst_AR}
-{ echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
-echo $ECHO_N "checking for archiver options (symbol ARFLAGS)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
+$as_echo_n "checking for archiver options (symbol ARFLAGS)... " >&6; }
 if test "${cf_cv_subst_ARFLAGS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$ARFLAGS" && ARFLAGS=rc
@@ -5593,8 +5844,8 @@ cf_cv_subst_ARFLAGS=$ARFLAGS
 fi
 
 ARFLAGS=${cf_cv_subst_ARFLAGS}
-{ echo "$as_me:$LINENO: result: $ARFLAGS" >&5
-echo "${ECHO_T}$ARFLAGS" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ARFLAGS" >&5
+$as_echo "$ARFLAGS" >&6; }
 
 
 
@@ -5653,8 +5904,8 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking where the main texmf tree is located" >&5
-echo $ECHO_N "checking where the main texmf tree is located... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking where the main texmf tree is located" >&5
+$as_echo_n "checking where the main texmf tree is located... " >&6; }
 case $prefix in
   */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
 esac
@@ -5666,12 +5917,12 @@ if test "x$datadir" != 'x${prefix}/share'; then
   texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'`
   # ... do complain if it wasn't found.
   if test -d "$texmfmain"; then
-    { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
-echo "${ECHO_T}\"$texmfmain\"" >&6; }
+    { $as_echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
+$as_echo "\"$texmfmain\"" >&6; }
   else
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-    { echo "$as_me:$LINENO: WARNING: No texmf tree found at $texmfmain.
+    { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: No texmf tree found at $texmfmain.
   *****************************************************************
   * Error: The main texmf tree was not found.                     *
   * If you do not have the files, you should be able to them from *
@@ -5679,7 +5930,7 @@ echo "${ECHO_T}not found" >&6; }
   * CTAN hosts.                                                   *
   *****************************************************************
   Winging it." >&5
-echo "$as_me: WARNING: No texmf tree found at $texmfmain.
+$as_echo "$as_me: WARNING: No texmf tree found at $texmfmain.
   *****************************************************************
   * Error: The main texmf tree was not found.                     *
   * If you do not have the files, you should be able to them from *
@@ -5708,13 +5959,13 @@ else
   fi
   texmfmain=`echo "$texmfmain" | sed 's,//*,/,g'`
   if test -n "$texmfmain"; then
-    { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
-echo "${ECHO_T}\"$texmfmain\"" >&6; }
+    { $as_echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
+$as_echo "\"$texmfmain\"" >&6; }
   else
     eval texmfmain="$datadir/texmf"
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-    { echo "$as_me:$LINENO: WARNING: The main texmf tree was not found at $texmfmain.
+    { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: The main texmf tree was not found at $texmfmain.
   *****************************************************************
   * Error: The main texmf tree was not found.                     *
   * Use the --datadir option to specify its parent directory.     *
@@ -5723,7 +5974,7 @@ echo "${ECHO_T}not found" >&6; }
   * CTAN hosts.                                                   *
   *****************************************************************
   Winging it by pretending $texmfmain is correct." >&5
-echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain.
+$as_echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain.
   *****************************************************************
   * Error: The main texmf tree was not found.                     *
   * Use the --datadir option to specify its parent directory.     *
@@ -5774,6 +6025,13 @@ fi
 
 
 
+# Check whether --with-luatex was given.
+if test "${with_luatex+set}" = set; then
+  withval=$with_luatex;
+fi
+
+
+
 # Check whether --with-xetex was given.
 if test "${with_xetex+set}" = set; then
   withval=$with_xetex;
@@ -5806,15 +6064,15 @@ if test "${enable_ipc+set}" = set; then
   enableval=$enable_ipc; if test "x$enableval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define IPC
+#define IPC /**/
 _ACEOF
 
   # -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
   # See ac_path_xtra.
-  { echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
 if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5867,37 +6125,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
 
   if test x$ac_cv_func_connect = xno; then
-    { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
 if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
@@ -5929,32 +6191,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_socket_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_socket_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+{ $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
   socketlibs="-lsocket $socketlibs"
 fi
@@ -5970,7 +6236,7 @@ fi
 if test "${enable_auto_core+set}" = set; then
   enableval=$enable_auto_core;
 cat >>confdefs.h <<\_ACEOF
-#define FUNNY_CORE_DUMP
+#define FUNNY_CORE_DUMP /**/
 _ACEOF
 
 
@@ -5982,7 +6248,7 @@ if test "${enable_dump_share+set}" = set; then
   enableval=$enable_dump_share; if test "x$enableval" = xno; then
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_DUMP_SHARE
+#define NO_DUMP_SHARE /**/
 _ACEOF
 
 fi
@@ -6010,7 +6276,7 @@ if test "${with_epsfwin+set}" = set; then
   withval=$with_epsfwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define EPSFWIN
+#define EPSFWIN /**/
 _ACEOF
 
 fi
@@ -6023,7 +6289,7 @@ if test "${with_hp2627win+set}" = set; then
   withval=$with_hp2627win; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HP2627WIN
+#define HP2627WIN /**/
 _ACEOF
 
 fi
@@ -6036,7 +6302,7 @@ if test "${with_mftalkwin+set}" = set; then
   withval=$with_mftalkwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define MFTALKWIN
+#define MFTALKWIN /**/
 _ACEOF
 
 fi
@@ -6049,7 +6315,7 @@ if test "${with_nextwin+set}" = set; then
   withval=$with_nextwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define NEXTWIN
+#define NEXTWIN /**/
 _ACEOF
 
 fi
@@ -6062,7 +6328,7 @@ if test "${with_regiswin+set}" = set; then
   withval=$with_regiswin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define REGISWIN
+#define REGISWIN /**/
 _ACEOF
 
 fi
@@ -6076,7 +6342,7 @@ if test "${with_suntoolswin+set}" = set; then
   wlibs="-lsuntool -lsunwindow -lpixrect $wlibs"
 
 cat >>confdefs.h <<\_ACEOF
-#define SUNWIN
+#define SUNWIN /**/
 _ACEOF
 
 fi
@@ -6089,7 +6355,7 @@ if test "${with_tektronixwin+set}" = set; then
   withval=$with_tektronixwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define TEKTRONIXWIN
+#define TEKTRONIXWIN /**/
 _ACEOF
 
 fi
@@ -6102,7 +6368,7 @@ if test "${with_unitermwin+set}" = set; then
   withval=$with_unitermwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define UNITERMWIN
+#define UNITERMWIN /**/
 _ACEOF
 
 fi
@@ -6134,8 +6400,8 @@ if test "${with_mf_x_toolkit+set}" = set; then
             y | ye | yes )      val=yes ;;
             n | no )            val=no  ;;
             * )
-{ echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&5
-echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&5
+$as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&2;}
               val=yes;;
           esac
           with_mf_x_toolkit=$val
@@ -6161,8 +6427,8 @@ if test "${with_ps+set}" = set; then
       no) PS_DEF=no;;
      dps) PS_DEF="$PS_DEF -DPS_DPS";;
     news) PS_DEF="$PS_DEF -DPS_NEWS";;
-       *) { echo "$as_me:$LINENO: WARNING: Unknown --with-ps argument \`$withval'; using gs." >&5
-echo "$as_me: WARNING: Unknown --with-ps argument \`$withval'; using gs." >&2;};;
+       *) { $as_echo "$as_me:$LINENO: WARNING: Unknown --with-ps argument \`$withval'; using gs." >&5
+$as_echo "$as_me: WARNING: Unknown --with-ps argument \`$withval'; using gs." >&2;};;
  esac
 fi
 
@@ -6332,8 +6598,8 @@ if test "${with_xdvi_x_toolkit+set}" = set; then
 	    x | xa | xaw )	val=xaw ;;
 	    m | mo | mot | moti | motif ) val=motif ;;
 	    * )
-{ echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw." >&5
-echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw." >&5
+$as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw." >&2;}
               val=xaw;;
 	  esac
 	  with_xdvi_x_toolkit=$val
@@ -6658,10 +6924,10 @@ else
 
   CURSESCPPFLAGS=
   if test "$try_ncurses" = yes; then
-    { echo "$as_me:$LINENO: checking for wresize in -lncurses" >&5
-echo $ECHO_N "checking for wresize in -lncurses... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for wresize in -lncurses" >&5
+$as_echo_n "checking for wresize in -lncurses... " >&6; }
 if test "${ac_cv_lib_ncurses_wresize+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
@@ -6693,32 +6959,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ncurses_wresize=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ncurses_wresize=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_wresize" >&5
-echo "${ECHO_T}$ac_cv_lib_ncurses_wresize" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_wresize" >&5
+$as_echo "$ac_cv_lib_ncurses_wresize" >&6; }
 if test $ac_cv_lib_ncurses_wresize = yes; then
   have_ncurses=yes
 else
@@ -6734,20 +7004,21 @@ _ACEOF
 
 for ac_header in ncurses/curses.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6763,32 +7034,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6802,69 +7074,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  HAVE_NCURSES_CURSES_H=yes
 else
@@ -6886,20 +7161,21 @@ done
 
 for ac_header in ncurses.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6915,32 +7191,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6954,69 +7231,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  HAVE_NCURSES_H=yes
 else
@@ -7038,28 +7318,29 @@ done
         # Try again, and check for the bogus ncurses/ include bug.
         # (i.e. ncurses/curses.h bogusly includes <unctrl.h> instead of
         # <ncurses/unctrl.h>)
-        { echo "$as_me:$LINENO: result: Trying again with -I/usr/include/ncurses..." >&5
-echo "${ECHO_T}Trying again with -I/usr/include/ncurses..." >&6; }
+        { $as_echo "$as_me:$LINENO: result: Trying again with -I/usr/include/ncurses..." >&5
+$as_echo "Trying again with -I/usr/include/ncurses..." >&6; }
         OLD_CPP="${CPP}"
         CPP="${CPP} -I/usr/include/ncurses"
         if (
 
 for ac_header in ncurses/curses.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7075,32 +7356,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7114,69 +7396,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  HAVE_NCURSES_CURSES_H=yes
 else
@@ -7196,8 +7481,8 @@ done
 
         if test "${HAVE_NCURSES_CURSES_H}" = "yes" ; then
           CURSESCPPFLAGS=-I/usr/include/ncurses
-          { echo "$as_me:$LINENO: result:     Your system has the bogus ncurses include bug." >&5
-echo "${ECHO_T}    Your system has the bogus ncurses include bug." >&6; }
+          { $as_echo "$as_me:$LINENO: result:     Your system has the bogus ncurses include bug." >&5
+$as_echo "    Your system has the bogus ncurses include bug." >&6; }
         else
           CPP="${OLD_CPP}"
         fi
@@ -7252,10 +7537,10 @@ else
 
   if test "$with_system_zlib" = yes; then
 
-{ echo "$as_me:$LINENO: checking for inflate in -lz" >&5
-echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+$as_echo_n "checking for inflate in -lz... " >&6; }
 if test "${ac_cv_lib_z_inflate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
@@ -7287,32 +7572,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_z_inflate=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_z_inflate=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6; }
+{ $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
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
@@ -7321,8 +7610,8 @@ _ACEOF
   LIBS="-lz $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
       with_system_zlib=no
 fi
 
@@ -7332,20 +7621,21 @@ fi
 
 for ac_header in zlib.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7361,32 +7651,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7400,69 +7691,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -7470,8 +7764,8 @@ fi
 done
 
     if test "$ac_cv_header_zlib_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
-echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
+$as_echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
       with_system_zlib=no
     fi
   fi
@@ -7523,10 +7817,10 @@ else
   CPP="$CPP $EXTRA_LIBPNG_INCLUDE"
 
   if test "$with_system_pnglib" = yes; then
-      { echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5
-echo $ECHO_N "checking for png_set_read_fn in -lpng... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5
+$as_echo_n "checking for png_set_read_fn in -lpng... " >&6; }
 if test "${ac_cv_lib_png_png_set_read_fn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
@@ -7558,37 +7852,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_png_png_set_read_fn=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_png_png_set_read_fn=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_set_read_fn" >&6; }
+{ $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
   pnglib=-lpng
 else
-  { echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;}
         with_system_pnglib=no
 fi
 
@@ -7657,10 +7955,10 @@ else
   CPPFLAGS="$CPPFLAGS $EXTRA_LIBT1_INCLUDE"
 
   if test "$with_system_t1lib" = yes; then
-      { echo "$as_me:$LINENO: checking for T1_AddFont in -lt1" >&5
-echo $ECHO_N "checking for T1_AddFont in -lt1... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for T1_AddFont in -lt1" >&5
+$as_echo_n "checking for T1_AddFont in -lt1... " >&6; }
 if test "${ac_cv_lib_t1_T1_AddFont+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lt1 -lz -lm $LIBS"
@@ -7692,37 +7990,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_t1_T1_AddFont=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_t1_T1_AddFont=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_AddFont" >&5
-echo "${ECHO_T}$ac_cv_lib_t1_T1_AddFont" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_AddFont" >&5
+$as_echo "$ac_cv_lib_t1_T1_AddFont" >&6; }
 if test $ac_cv_lib_t1_T1_AddFont = yes; then
   t1lib=-lt1
 else
-  { echo "$as_me:$LINENO: WARNING: Standard T1 library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard T1 library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard T1 library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard T1 library not found. Compiling my own." >&2;}
         with_system_t1lib=no
 fi
 
@@ -7730,8 +8032,8 @@ fi
 
   LIBS="-lt1 -lm $LIBS"
   if test "$with_system_t1lib" = yes; then
-      { echo "$as_me:$LINENO: checking whether installed T1 lib is >= v 5.0.0 " >&5
-echo $ECHO_N "checking whether installed T1 lib is >= v 5.0.0 ... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether installed T1 lib is >= v 5.0.0 " >&5
+$as_echo_n "checking whether installed T1 lib is >= v 5.0.0 ... " >&6; }
       if test "$cross_compiling" = yes; then
   ac_compile_t1lib=1
 
@@ -7778,39 +8080,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compile_t1lib=0
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_compile_t1lib=1
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
       if test $ac_compile_t1lib = 0; then
-	  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+	  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
       else
-          { echo "$as_me:$LINENO: result: no, will compile my own version" >&5
-echo "${ECHO_T}no, will compile my own version" >&6; }
+          { $as_echo "$as_me:$LINENO: result: no, will compile my own version" >&5
+$as_echo "no, will compile my own version" >&6; }
 	  with_system_t1lib=no
       fi
   fi
@@ -7860,15 +8165,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -7900,20 +8205,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -7937,13 +8243,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -7951,7 +8258,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -7976,8 +8283,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -8005,20 +8312,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -8042,13 +8350,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -8056,7 +8365,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -8072,9 +8381,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8095,10 +8404,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
   if test "$with_system_freetype" = yes; then
 
-{ echo "$as_me:$LINENO: checking for TT_Init_FreeType in -lttf" >&5
-echo $ECHO_N "checking for TT_Init_FreeType in -lttf... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for TT_Init_FreeType in -lttf" >&5
+$as_echo_n "checking for TT_Init_FreeType in -lttf... " >&6; }
 if test "${ac_cv_lib_ttf_TT_Init_FreeType+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lttf  $LIBS"
@@ -8130,32 +8439,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ttf_TT_Init_FreeType=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ttf_TT_Init_FreeType=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ttf_TT_Init_FreeType" >&5
-echo "${ECHO_T}$ac_cv_lib_ttf_TT_Init_FreeType" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ttf_TT_Init_FreeType" >&5
+$as_echo "$ac_cv_lib_ttf_TT_Init_FreeType" >&6; }
 if test $ac_cv_lib_ttf_TT_Init_FreeType = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTTF 1
@@ -8164,8 +8477,8 @@ _ACEOF
   LIBS="-lttf $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard FREETYPE library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard FREETYPE library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard FREETYPE library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard FREETYPE library not found. Compiling my own." >&2;}
       with_system_freetype=no
 fi
 
@@ -8175,20 +8488,21 @@ fi
 
 for ac_header in freetype.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8204,32 +8518,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8243,69 +8558,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -8313,8 +8631,8 @@ fi
 done
 
     if test "$ac_cv_header_freetype_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: freetype.h not found. Using my own freetype sources." >&5
-echo "$as_me: WARNING: freetype.h not found. Using my own freetype sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: freetype.h not found. Using my own freetype sources." >&5
+$as_echo "$as_me: WARNING: freetype.h not found. Using my own freetype sources." >&2;}
       with_system_freetype=no
     fi
   fi
@@ -8366,10 +8684,10 @@ else
 
   if test "$with_system_freetype2" = yes; then
 
-{ echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
-echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
+$as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
 if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfreetype  $LIBS"
@@ -8401,32 +8719,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_freetype_FT_Init_FreeType=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_freetype_FT_Init_FreeType=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
-echo "${ECHO_T}$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
+{ $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
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBFREETYPE 1
@@ -8435,8 +8757,8 @@ _ACEOF
   LIBS="-lfreetype $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard FreeType2 library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard FreeType2 library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard FreeType2 library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard FreeType2 library not found. Compiling my own." >&2;}
       with_system_freetype2=no
 fi
 
@@ -8446,20 +8768,21 @@ fi
 
 for ac_header in ft2build.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8475,32 +8798,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8514,69 +8838,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -8584,8 +8911,8 @@ fi
 done
 
     if test "$ac_cv_header_ft2build_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: ft2build.h not found. Using my own freetype2 sources." >&5
-echo "$as_me: WARNING: ft2build.h not found. Using my own freetype2 sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: ft2build.h not found. Using my own freetype2 sources." >&5
+$as_echo "$as_me: WARNING: ft2build.h not found. Using my own freetype2 sources." >&2;}
       with_system_freetype2=no
     fi
   fi
@@ -8637,10 +8964,10 @@ else
 
   if test "$with_system_gd" = yes; then
 
-{ echo "$as_me:$LINENO: checking for gdImageCreateFromPng in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromPng in -lgd... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for gdImageCreateFromPng in -lgd" >&5
+$as_echo_n "checking for gdImageCreateFromPng in -lgd... " >&6; }
 if test "${ac_cv_lib_gd_gdImageCreateFromPng+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
@@ -8672,32 +8999,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_gd_gdImageCreateFromPng=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_gd_gdImageCreateFromPng=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromPng" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreateFromPng" >&6; }
 if test $ac_cv_lib_gd_gdImageCreateFromPng = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGD 1
@@ -8706,8 +9037,8 @@ _ACEOF
   LIBS="-lgd $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard gd library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard gd library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard gd library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard gd library not found. Compiling my own." >&2;}
       with_system_gd=no
 fi
 
@@ -8715,10 +9046,10 @@ fi
 
   if test "$with_system_gd" = yes; then
 
-{ echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
-echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
+$as_echo_n "checking for gdImageGif in -lgd... " >&6; }
 if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
@@ -8750,32 +9081,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_gd_gdImageGif=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_gd_gdImageGif=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGif" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageGif" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGif" >&5
+$as_echo "$ac_cv_lib_gd_gdImageGif" >&6; }
 if test $ac_cv_lib_gd_gdImageGif = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGD 1
@@ -8784,8 +9119,8 @@ _ACEOF
   LIBS="-lgd $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: gd library does not have the necessary gif support. Compiling my own." >&5
-echo "$as_me: WARNING: gd library does not have the necessary gif support. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: gd library does not have the necessary gif support. Compiling my own." >&5
+$as_echo "$as_me: WARNING: gd library does not have the necessary gif support. Compiling my own." >&2;}
       with_system_gd=no
 fi
 
@@ -8795,20 +9130,21 @@ fi
 
 for ac_header in gd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8824,32 +9160,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8863,69 +9200,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -8933,8 +9273,8 @@ fi
 done
 
     if test "$ac_cv_header_gd_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: gd.h not found. Using my own gd sources." >&5
-echo "$as_me: WARNING: gd.h not found. Using my own gd sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: gd.h not found. Using my own gd sources." >&5
+$as_echo "$as_me: WARNING: gd.h not found. Using my own gd sources." >&2;}
       with_system_gd=no
     fi
   fi
@@ -8986,10 +9326,10 @@ else
 
   if test x"$with_system_icu" = xyes; then
 
-{ echo "$as_me:$LINENO: checking for ubidi_open in -licuuc" >&5
-echo $ECHO_N "checking for ubidi_open in -licuuc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ubidi_open in -licuuc" >&5
+$as_echo_n "checking for ubidi_open in -licuuc... " >&6; }
 if test "${ac_cv_lib_icuuc_ubidi_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-licuuc  $LIBS"
@@ -9021,32 +9361,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_icuuc_ubidi_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_icuuc_ubidi_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_icuuc_ubidi_open" >&5
-echo "${ECHO_T}$ac_cv_lib_icuuc_ubidi_open" >&6; }
+{ $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
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBICUUC 1
@@ -9055,8 +9399,8 @@ _ACEOF
   LIBS="-licuuc $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard ICU library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard ICU library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard ICU library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard ICU library not found. Compiling my own." >&2;}
       with_system_icu=no
 fi
 
@@ -9066,20 +9410,21 @@ fi
 
 for ac_header in ubidi.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9095,32 +9440,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9134,69 +9480,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9204,8 +9553,8 @@ fi
 done
 
     if test "$ac_cv_header_ubidi_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: ubidi.h not found. Using my own ICU sources." >&5
-echo "$as_me: WARNING: ubidi.h not found. Using my own ICU sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: ubidi.h not found. Using my own ICU sources." >&5
+$as_echo "$as_me: WARNING: ubidi.h not found. Using my own ICU sources." >&2;}
       with_system_icu=no
     fi
   fi
@@ -9302,6 +9651,8 @@ test "$needs_graphite" = yes \
 test "$needs_obsdcompat" = yes \
   && LIBSDIRS="$LIBSDIRS $LIBOBSDCOMPATDIR"
 
+
+
 subdirs="$subdirs libs"
 
 
@@ -9408,11 +9759,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-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) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -9445,12 +9797,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -9467,6 +9819,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
 ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
 :clear
 s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
@@ -9496,7 +9854,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -9509,11 +9867,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -9526,7 +9885,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -9536,7 +9895,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -9558,17 +9917,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -9584,8 +9971,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -9608,7 +9993,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -9621,17 +10006,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -9653,7 +10031,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -9704,7 +10082,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -9732,7 +10110,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -9745,19 +10122,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -9782,10 +10162,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -9808,7 +10188,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9821,13 +10201,13 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -9840,7 +10220,7 @@ Usage: $0 [OPTIONS] [FILE]...
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -9848,24 +10228,24 @@ $config_files
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -9887,21 +10267,24 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -9920,30 +10303,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -9951,8 +10336,8 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -9991,232 +10376,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-LEX!$LEX$ac_delim
-LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
-LEXLIB!$LEXLIB$ac_delim
-YACC!$YACC$ac_delim
-YFLAGS!$YFLAGS$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-LN_S!$LN_S$ac_delim
-ALLOCA!$ALLOCA$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-RANLIB!$RANLIB$ac_delim
-XMKMF!$XMKMF$ac_delim
-MAINT!$MAINT$ac_delim
-LD!$LD$ac_delim
-AR!$AR$ac_delim
-ARFLAGS!$ARFLAGS$ac_delim
-texmfmain!$texmfmain$ac_delim
-socketlibs!$socketlibs$ac_delim
-LDT1LIB!$LDT1LIB$ac_delim
-CURSESCPPFLAGS!$CURSESCPPFLAGS$ac_delim
-LDCURSESLIB!$LDCURSESLIB$ac_delim
-CURSESDEP!$CURSESDEP$ac_delim
-ZLIBCPPFLAGS!$ZLIBCPPFLAGS$ac_delim
-LDZLIB!$LDZLIB$ac_delim
-ZLIBDEP!$ZLIBDEP$ac_delim
-LIBPNGCPPFLAGS!$LIBPNGCPPFLAGS$ac_delim
-LDLIBPNG!$LDLIBPNG$ac_delim
-LIBPNGDEP!$LIBPNGDEP$ac_delim
-LIBXPDFCPPFLAGS!$LIBXPDFCPPFLAGS$ac_delim
-LDLIBXPDF!$LDLIBXPDF$ac_delim
-LIBXPDFDEP!$LIBXPDFDEP$ac_delim
-LIBT1CPPFLAGS!$LIBT1CPPFLAGS$ac_delim
-LDLIBT1!$LDLIBT1$ac_delim
-LIBT1DEP!$LIBT1DEP$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-FREETYPECPPFLAGS!$FREETYPECPPFLAGS$ac_delim
-LDFREETYPE!$LDFREETYPE$ac_delim
-FREETYPEDEP!$FREETYPEDEP$ac_delim
-FREETYPE2CPPFLAGS!$FREETYPE2CPPFLAGS$ac_delim
-LDFREETYPE2!$LDFREETYPE2$ac_delim
-FREETYPE2DEP!$FREETYPE2DEP$ac_delim
-GDCPPFLAGS!$GDCPPFLAGS$ac_delim
-LDGD!$LDGD$ac_delim
-GDDEP!$GDDEP$ac_delim
-ICUCPPFLAGS!$ICUCPPFLAGS$ac_delim
-LDICU!$LDICU$ac_delim
-ICUDEP!$ICUDEP$ac_delim
-GRAPHITECPPFLAGS!$GRAPHITECPPFLAGS$ac_delim
-LDGRAPHITE!$LDGRAPHITE$ac_delim
-GRAPHITEDEP!$GRAPHITEDEP$ac_delim
-TECKITCPPFLAGS!$TECKITCPPFLAGS$ac_delim
-LDTECKIT!$LDTECKIT$ac_delim
-TECKITDEP!$TECKITDEP$ac_delim
-LIBOBSDCFLAGS!$LIBOBSDCFLAGS$ac_delim
-LDLIBOBSD!$LDLIBOBSD$ac_delim
-LIBOBSDDEP!$LIBOBSDDEP$ac_delim
-subdirs!$subdirs$ac_delim
-ESUBDIRS!$ESUBDIRS$ac_delim
-LIBSDEP!$LIBSDEP$ac_delim
-LIBSDIRS!$LIBSDIRS$ac_delim
-FMU!$FMU$ac_delim
-INSTDIRS!$INSTDIRS$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$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
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -10232,19 +10528,21 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-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;;
@@ -10273,26 +10571,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -10302,7 +10612,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10328,7 +10638,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -10337,7 +10647,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10358,17 +10668,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10408,12 +10718,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -10422,13 +10733,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -10442,15 +10754,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -10460,21 +10773,28 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -10489,6 +10809,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -10516,7 +10841,8 @@ fi
 #
 if test "$no_recursion" != yes; then
 
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
+  # so they do not pile up.
   ac_sub_configure_args=
   ac_prev=
   eval "set x $ac_configure_args"
@@ -10545,9 +10871,11 @@ if test "$no_recursion" != yes; then
       ac_prev=prefix ;;
     -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
       ;;
+    --disable-option-checking)
+      ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
     esac
@@ -10557,7 +10885,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -10566,6 +10894,10 @@ if test "$no_recursion" != yes; then
     ac_sub_configure_args="--silent $ac_sub_configure_args"
   fi
 
+  # Always prepend --disable-option-checking to silence warnings, since
+  # different subdirs can have different --enable and --with options.
+  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
+
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
 
@@ -10574,8 +10906,8 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    echo "$as_me:$LINENO: $ac_msg" >&5
-    echo "$ac_msg" >&6
+    $as_echo "$as_me:$LINENO: $ac_msg" >&5
+    $as_echo "$ac_msg" >&6
     { as_dir="$ac_dir"
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
@@ -10584,7 +10916,7 @@ if test "$no_recursion" != yes; then
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -10593,7 +10925,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10614,17 +10946,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10663,8 +10995,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       # This should be Cygnus configure.
       ac_sub_configure=$ac_aux_dir/configure
     else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -10677,17 +11009,21 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
     cd "$ac_popdir"
   done
 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;}
+fi
 
diff --git a/Build/source/libs/luafontforge/Makefile b/Build/source/libs/luafontforge/Makefile
index 976dff883e3..84564f19ad2 100644
--- a/Build/source/libs/luafontforge/Makefile
+++ b/Build/source/libs/luafontforge/Makefile
@@ -1,10 +1,11 @@
 # $Id$
 
-srcdir=../../../src/libs/luafontforge
+srcdir=../../../libs/luafontforge
 
 FF_LIB=ffdummies.o luafflib.o
 
-MY_CFLAGS=-g -O2 -Wall -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 $(CFLAGS) $(XCFLAGS)
+_CFLAGS=-Wall -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 $(XCFLAGS)
+CFLAGS = -g -O2
 
 .PHONY: newfile
 
@@ -16,9 +17,9 @@ fontforge: $(FF_LIB) newfile
 	ranlib libff.a
 
 %.o: $(srcdir)/src/%.c
-	gcc $(MY_CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
+	gcc $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
 
 clean:
 	rm  -f libff.a $(FF_LIB)
 	cd fontforge; $(MAKE) clean
-	cd Unicode; $(MAKE) clean
\ No newline at end of file
+	cd Unicode; $(MAKE) clean
diff --git a/Build/source/libs/luafontforge/fontforge/Unicode/Makefile b/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
index 7fb7c8060b0..8e215835910 100644
--- a/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
+++ b/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
@@ -1,15 +1,15 @@
-
-top_srcdir = ../../../../src/libs/luafontforge/fontforge
+# $Id$
+top_srcdir = ../../../../libs/luafontforge/fontforge
 srcdir = $(top_srcdir)/Unicode
 
 CC = gcc
 
 OBJECTS = alphabet.o char.o memory.o cjk.o ustring.o gwwiconv.o
 
-CFLAGS = -I$(top_srcdir)/inc -Wall -g -O2 -DLUA_FF_LIB=1 $(XCFLAGS)
+_CFLAGS = -I$(top_srcdir)/inc -Wall -DLUA_FF_LIB=1 $(XCFLAGS)
+CFLAGS = -g -O2
 
 all: $(OBJECTS)
 
 %.o: $(srcdir)/%.c 
-	$(CC) $(CFLAGS) -c $< -o $@
-
+	$(CC) $(_CFLAGS) $(CFLAGS) -c $< -o $@
diff --git a/Build/source/libs/luafontforge/fontforge/fontforge/Makefile b/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
index 945cd1f5471..d0e7b983446 100644
--- a/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
+++ b/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
@@ -1,5 +1,5 @@
 
-top_srcdir = ../../../../src/libs/luafontforge/fontforge
+top_srcdir = ../../../../libs/luafontforge/fontforge
 srcdir = $(top_srcdir)/fontforge
 
 CC = gcc
@@ -22,7 +22,7 @@ _CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. -Wall $(XCFLAGS) \
  -DNODYNAMIC=1 -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 \
  -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 -UHAVE_LIBINTL_H
 
-CFLAGS = -g -O2 $(_CFLAGS)
+CFLAGS = -g -O2
 
 all: $(OBJECTS)
 
@@ -33,4 +33,4 @@ splinerefigure.o: $(srcdir)/splinerefigure.c $(srcdir)/splinefont.h
 	$(CC) -g -c -o splinerefigure.o $(_CFLAGS) $(srcdir)/splinerefigure.c
 
 %.o: $(srcdir)/%.c $(srcdir)/splinefont.h $(srcdir)/views.h $(srcdir)/stemdb.h $(srcdir)/ttf.h $(srcdir)/unicoderange.h $(srcdir)/psfont.h $(srcdir)/groups.h $(srcdir)/edgelist.h $(srcdir)/edgelist2.h
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(_CFLAGS) $(CFLAGS) -c $< -o $@
diff --git a/Build/source/libs/zziplib/zzip/Makefile b/Build/source/libs/zziplib/zzip/Makefile
index 51828cab270..f12e62ae9d3 100644
--- a/Build/source/libs/zziplib/zzip/Makefile
+++ b/Build/source/libs/zziplib/zzip/Makefile
@@ -1,5 +1,5 @@
 
-top_srcdir = ../../../../src/libs/zziplib
+top_srcdir = ../../../../libs/zziplib
 srcdir = $(top_srcdir)/zzip
 
 CC = gcc
@@ -9,7 +9,7 @@ RANLIB = ranlib
 OBJECTS =dir.o err.o fetch.o file.o info.o memdisk.o mmapped.o \
          plugin.o stat.o write.o zip.o
 
-_CFLAGS = -DHAVE_CONFIG_H -I.. -I../../../../src/libs/zziplib -I../../../../src/libs/zlib -Wall
+_CFLAGS = -DHAVE_CONFIG_H -I.. -I../../../../libs/zziplib -I../../../../libs/zlib -Wall
 
 XCFLAGS = $(_CFLAGS)
 
diff --git a/Build/source/stamp-aclocal b/Build/source/stamp-aclocal
index 9dbc03bd04f..500fcc016d3 100644
--- a/Build/source/stamp-aclocal
+++ b/Build/source/stamp-aclocal
@@ -1 +1 @@
-Mon Apr  7 11:19:41 CEST 2008
+Fri Apr 11 18:43:01 CEST 2008
diff --git a/Build/source/stamp-configure b/Build/source/stamp-configure
index 5e79cefc383..33fce353102 100644
--- a/Build/source/stamp-configure
+++ b/Build/source/stamp-configure
@@ -1 +1 @@
-Mon Apr  7 11:19:42 CEST 2008
+Fri Apr 11 18:43:03 CEST 2008
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 2fc1624edfc..b26cb1ee1f8 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-11  Karl Berry  <karl@tug.org>
+
+	* xetexdir/xetex.h (Byte): #define to my_Byte and then #undef to avoid typedef
+	conflict between TECkit_Common.h and zlib; sigh.
+
 2008-03-30  Karl Berry  <karl@tug.org>
 
 	* Makefile.in (web2c): pass . for native tooldir argument.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 0b3510078d8..b584b68e028 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -78,8 +78,10 @@ proglib = lib/lib.a
 windowlib = window/window.a
 
 # The sh script that does the conversion.  The "." is the directory with
-# native tools; we don't attempt cross-compiling a la luatex.
-web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert .
+# native tools; we don't attempt cross-compiling a la luatex.  The
+# $(native) variable is used in luatex.mk.
+native = .
+web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert $(native)
 
 # Additional dependencies:
 web2c_common = web2c/convert web2c/common.defines
@@ -96,7 +98,7 @@ TIE = @TIE@
 # Calling tangle
 tangle = WEBINPUTS=.:$(srcdir) $(TANGLE)
 ctangle = $(CTANGLE)
-tie = $(TIE)
+tie = $(native)/$(TIE)
 
 # The environment for making dumps.
 # No need to specify TEXMF, as ../kpathsea/texmf.cnf should contain
@@ -429,7 +431,7 @@ dvitype_args = -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'
 
 # 
 # Metafont
-mf_c = mfini.c mf0.c mf1.c 
+mf_c = mfini.c mf0.c mf1.c
 mf_o = mfini.o mf0.o mf1.o mf-pool.o mfextra.o
 mfn_o = mfini.o mf0.o mf1.o mf-pool.o mfnowin.o
 mf: $(mf_o) $(windowlib)
@@ -578,9 +580,10 @@ trip-clean:
 	rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex
 	rm -rf tfm
 # 
-# Helper makefile fragment for pdf*tex.
+# Helper makefile fragments for pdf*tex and luatex.
+kpse_include libsluapdf.mk
 kpse_include pdftexdir/pdftexlib.mk
-#LUATEXkpse_include pdftexdir/luatexlib.mk
+kpse_include luatexdir/luatexlib.mk
 # 
 # Makefile fragments:
 kpse_include etexdir/etex.mk
@@ -588,7 +591,7 @@ kpse_include omegadir/omega.mk
 kpse_include alephdir/aleph.mk
 kpse_include pdftexdir/pdftex.mk
 kpse_include xetexdir/xetex.mk
-#LUATEXkpse_include luatexdir/luatex.mk
+kpse_include luatexdir/luatex.mk
 
 # 
 # non-engine programs.
@@ -602,8 +605,7 @@ programs = bibtex ctangle ctie cweave dvicopy dvitomp dvitype gftodvi gftopk \
 engines = $(tex) $(etex) $(mf) $(mfn) $(metapost) \
           $(omega) $(aleph) \
           $(pdftex) $(pdfetex) \
-          $(xetex) #LUATEX\
-#LUATEX          $(luatex)
+          $(xetex) $(luatex)
 
 programs: $(programs) $(engines) $(mpware_programs) \
           $(omegafonts_programs) $(otps_programs) $(pdftosrc)
@@ -1145,7 +1147,8 @@ installcheck:
 
 # 
 # Cleaning.
-all_subdirs = doc lib man $(mpware) web2c window $(omegafonts) $(otps) $(pdftexdir) $(mpostdir) #LUATEX $(luatexdir)
+all_subdirs = doc lib man $(mpware) web2c window $(omegafonts) $(otps) \
+              $(pdftexdir) $(mpostdir) $(luatexdir) 
 
 # Having a multiple-target rule with the subdir loop fails because of
 # the dependencies introduced by clean.mk.  Yet, we want the
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index 61b721ca28f..dad0a90f089 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -174,9 +174,13 @@
 /* metafont: Define to include Uniterm window support */
 #undef UNITERMWIN
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+#elif ! defined __LITTLE_ENDIAN__
+# undef WORDS_BIGENDIAN
+#endif
 
 /* Define to include X11 window in Metafont. */
 #undef X11WIN
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 08a90a15f7a..b7733a0b381 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.62.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -713,6 +735,7 @@ CXXHACKLINK
 CXXHACKLDLIBS
 PTEX
 PETEX
+LTEX
 XETEX
 build
 build_cpu
@@ -755,6 +778,56 @@ OTANGLE
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_etex
+with_omega
+with_aleph
+with_pdftex
+with_pdfetex
+with_luatex
+with_xetex
+with_cxx_runtime_hack
+with_editor
+enable_ipc
+enable_auto_core
+enable_dump_share
+enable_fmtutil
+with_mf_nowin
+with_epsfwin
+with_hp2627win
+with_mftalkwin
+with_nextwin
+with_regiswin
+with_suntoolswin
+with_tektronixwin
+with_unitermwin
+with_x_toolkit
+with_x11win
+with_x11
+with_mf_x_toolkit
+enable_maintainer_mode
+with_mktexmf_default
+with_mktexpk_default
+with_mktextfm_default
+with_mkocp_default
+with_mkofm_default
+with_mktexfmt_default
+with_mktextex_default
+with_system_zlib
+with_zlib_libdir
+with_zlib_include
+with_system_pnglib
+with_pnglib_libdir
+with_pnglib_include
+with_system_freetype2
+with_freetype2_libdir
+with_freetype2_include
+with_icu_libdir
+with_icu_include
+with_fontconfig
+with_x
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -775,6 +848,8 @@ XMKMF'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -873,13 +948,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -892,13 +975,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1089,22 +1180,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1124,7 +1231,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1133,16 +1240,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1151,22 +1258,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+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
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1181,7 +1304,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1197,10 +1320,10 @@ 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 .` ||
-  { 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" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1208,12 +1331,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1240,12 +1363,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1294,9 +1417,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1306,25 +1429,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1344,6 +1467,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-ipc            enable TeX's --ipc option, i.e., pipe to a program
@@ -1361,6 +1485,7 @@ Optional Packages:
   --without-aleph            don't compile and install Aleph
   --without-pdftex           don't compile and install pdfTeX
   --without-pdfetex          don't compile and install pdfeTeX
+  --without-luatex           don't compile and install pdfTeX
   --without-xetex            don't compile and install XeTeX
   --with-cxx-runtime-hack    link C++ runtime statically
   --with-editor=CMD       invoke CMD from the e option vi +%d %s
@@ -1399,7 +1524,6 @@ Optional Packages:
   --with-freetype2-include=DIR
                           Specify the freetype2 header files location.
                             (both DIR and DIR/freetype2 will be added to the include paths)
-  --with-system-icu        use installed ICU library
   --with-icu-libdir=DIR
                           Specify directory where the ICU library resides.
   --with-icu-include=DIR
@@ -1437,15 +1561,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1481,7 +1607,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1491,10 +1617,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1505,7 +1631,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.61.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1541,7 +1667,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1576,7 +1702,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1628,11 +1754,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-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) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1662,9 +1789,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1679,9 +1806,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1697,8 +1824,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1740,21 +1867,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1764,16 +1894,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1787,29 +1917,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1819,10 +1958,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&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
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1868,10 +2007,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1884,7 +2023,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1895,11 +2034,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1908,10 +2047,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1924,7 +2063,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1935,11 +2074,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -1947,10 +2086,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -1965,10 +2104,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1981,7 +2120,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1992,11 +2131,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2005,10 +2144,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2026,7 +2165,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2049,11 +2188,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2064,10 +2203,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2080,7 +2219,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2091,11 +2230,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2108,10 +2247,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2124,7 +2263,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2135,11 +2274,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2151,10 +2290,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -2166,44 +2305,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2222,27 +2365,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2253,10 +2391,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2267,7 +2406,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2294,15 +2433,15 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
@@ -2311,8 +2450,8 @@ ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2321,49 +2460,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $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
-echo "$as_me: error: cannot run C compiled programs.
+$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; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2372,31 +2513,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$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; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2419,40 +2560,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2478,20 +2620,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2501,15 +2644,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2536,20 +2683,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2574,20 +2722,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2613,20 +2762,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2641,8 +2791,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2658,10 +2808,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -2732,20 +2882,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2761,15 +2912,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -2796,8 +2947,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2823,11 +2974,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2856,17 +3008,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -2879,8 +3043,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2890,22 +3054,23 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2922,12 +3087,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2936,10 +3101,10 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -2952,7 +3117,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2963,11 +3128,11 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2980,10 +3145,10 @@ for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_LEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -2996,7 +3161,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LEX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3007,11 +3172,11 @@ fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  { echo "$as_me:$LINENO: result: $LEX" >&5
-echo "${ECHO_T}$LEX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3044,15 +3209,16 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ echo "$as_me:$LINENO: checking lex output file root" >&5
-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
 if test "${ac_cv_prog_lex_root+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test -f lex.yy.c; then
@@ -3060,20 +3226,20 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 if test -z "${LEXLIB+set}"; then
-  { echo "$as_me:$LINENO: checking lex library" >&5
-echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
 if test "${ac_cv_lib_lex+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     ac_save_LIBS=$LIBS
@@ -3089,26 +3255,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_lex=$ac_lib
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       test "$ac_cv_lib_lex" != 'none needed' && break
@@ -3116,16 +3286,16 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     LIBS=$ac_save_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
 # default is implementation-dependent.  Figure out which it is, since
@@ -3143,33 +3313,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3190,10 +3364,10 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3206,7 +3380,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3217,11 +3391,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3230,10 +3404,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -3246,7 +3420,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3257,11 +3431,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -3269,10 +3443,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -3288,15 +3462,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3328,20 +3502,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3365,13 +3540,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3379,7 +3555,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3404,8 +3580,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3433,20 +3609,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3470,13 +3647,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3484,7 +3662,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3500,9 +3678,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3514,42 +3692,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3564,74 +3737,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3646,40 +3805,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3706,20 +3856,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -3811,37 +3962,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3863,11 +4017,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3885,20 +4039,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -3906,12 +4061,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+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
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3923,20 +4080,21 @@ done
 
 for ac_header in sys/time.h sys/timeb.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3952,32 +4110,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3991,69 +4150,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4067,11 +4229,11 @@ done
 
 for ac_func in strerror gettimeofday ftime mkstemp mktemp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4124,45 +4286,51 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
 if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4187,20 +4355,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_type_signal=int
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_type_signal=void
@@ -4208,8 +4377,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
@@ -4218,10 +4387,10 @@ _ACEOF
 
 
 
-{ echo "$as_me:$LINENO: checking whether gcc asm needs underscore" >&5
-echo $ECHO_N "checking whether gcc asm needs underscore... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether gcc asm needs underscore" >&5
+$as_echo_n "checking whether gcc asm needs underscore... " >&6; }
 if test "${pb_cv_asm_underscore+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 # Older versions of GCC asm for i386 need an underscore prepended to
@@ -4249,31 +4418,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   pb_cv_asm_underscore=no
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	pb_cv_asm_underscore=yes
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $pb_cv_asm_underscore" >&5
-echo "${ECHO_T}$pb_cv_asm_underscore" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $pb_cv_asm_underscore" >&5
+$as_echo "$pb_cv_asm_underscore" >&6; }
 if test "x$pb_cv_asm_underscore" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4284,10 +4457,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
 if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
@@ -4310,20 +4483,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_inline=$ac_kw
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4334,8 +4508,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 
 case $ac_cv_c_inline in
@@ -4354,10 +4528,10 @@ _ACEOF
 esac
 
 
-{ echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
-echo $ECHO_N "checking for loader (symbol LD)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
+$as_echo_n "checking for loader (symbol LD)... " >&6; }
 if test "${cf_cv_subst_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$LD" && LD=ld
@@ -4365,14 +4539,14 @@ cf_cv_subst_LD=$LD
 fi
 
 LD=${cf_cv_subst_LD}
-{ echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
-echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
+$as_echo_n "checking for archiver (symbol AR)... " >&6; }
 if test "${cf_cv_subst_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$AR" && AR=ar
@@ -4380,14 +4554,14 @@ cf_cv_subst_AR=$AR
 fi
 
 AR=${cf_cv_subst_AR}
-{ echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
-echo $ECHO_N "checking for archiver options (symbol ARFLAGS)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
+$as_echo_n "checking for archiver options (symbol ARFLAGS)... " >&6; }
 if test "${cf_cv_subst_ARFLAGS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$ARFLAGS" && ARFLAGS=rc
@@ -4395,8 +4569,8 @@ cf_cv_subst_ARFLAGS=$ARFLAGS
 fi
 
 ARFLAGS=${cf_cv_subst_ARFLAGS}
-{ echo "$as_me:$LINENO: result: $ARFLAGS" >&5
-echo "${ECHO_T}$ARFLAGS" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ARFLAGS" >&5
+$as_echo "$ARFLAGS" >&6; }
 
 
 
@@ -4404,10 +4578,10 @@ echo "${ECHO_T}$ARFLAGS" >&6; }
 # From: bernt@weinberg.pop.bio.aau.dk (Bernt Guldbrandtsen)
 if test `(uname) 2>/dev/null` = aux; then
 
-{ echo "$as_me:$LINENO: checking for sigemptyset in -lposix" >&5
-echo $ECHO_N "checking for sigemptyset in -lposix... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sigemptyset in -lposix" >&5
+$as_echo_n "checking for sigemptyset in -lposix... " >&6; }
 if test "${ac_cv_lib_posix_sigemptyset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
@@ -4439,32 +4613,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_posix_sigemptyset=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_posix_sigemptyset=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_sigemptyset" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_sigemptyset" >&6; }
+{ $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
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPOSIX 1
@@ -4487,10 +4665,10 @@ cross_compiling=no
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
-echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether char is unsigned" >&5
+$as_echo_n "checking whether char is unsigned... " >&6; }
 if test "${ac_cv_c_char_unsigned+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4515,20 +4693,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_char_unsigned=no
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_char_unsigned=yes
@@ -4536,8 +4715,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
-echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
+$as_echo "$ac_cv_c_char_unsigned" >&6; }
 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
   cat >>confdefs.h <<\_ACEOF
 #define __CHAR_UNSIGNED__ 1
@@ -4545,28 +4724,72 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
+       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;
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=universal
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -4578,33 +4801,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -4616,20 +4840,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -4637,29 +4862,31 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
   ;
   return 0;
 }
@@ -4670,137 +4897,104 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <limits.h>
+
 int
 main ()
 {
-
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+	ac_cv_c_bigendian=no
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+return use_ascii (foo) == use_ebcdic (foo);
   ;
   return 0;
 }
@@ -4811,38 +5005,128 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_long=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=no
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+    fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
+      ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+   { (exit 1); exit 1; }; } ;;
+ esac
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
 if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -4853,11 +5137,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -4870,13 +5153,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4890,11 +5174,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -4907,20 +5190,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -4934,7 +5218,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -4944,11 +5228,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -4961,13 +5244,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4981,11 +5265,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -4998,20 +5281,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -5025,7 +5309,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -5045,11 +5329,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -5062,20 +5345,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -5086,9 +5370,9 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -5103,9 +5387,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -5115,20 +5398,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (long))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -5141,43 +5426,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
@@ -5239,6 +5527,13 @@ fi
 
 
 
+# Check whether --with-luatex was given.
+if test "${with_luatex+set}" = set; then
+  withval=$with_luatex;
+fi
+
+
+
 # Check whether --with-xetex was given.
 if test "${with_xetex+set}" = set; then
   withval=$with_xetex;
@@ -5271,15 +5566,15 @@ if test "${enable_ipc+set}" = set; then
   enableval=$enable_ipc; if test "x$enableval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define IPC
+#define IPC /**/
 _ACEOF
 
   # -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
   # See ac_path_xtra.
-  { echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
 if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5332,37 +5627,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
 
   if test x$ac_cv_func_connect = xno; then
-    { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
 if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
@@ -5394,32 +5693,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_socket_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_socket_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+{ $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
   socketlibs="-lsocket $socketlibs"
 fi
@@ -5435,7 +5738,7 @@ fi
 if test "${enable_auto_core+set}" = set; then
   enableval=$enable_auto_core;
 cat >>confdefs.h <<\_ACEOF
-#define FUNNY_CORE_DUMP
+#define FUNNY_CORE_DUMP /**/
 _ACEOF
 
 
@@ -5447,7 +5750,7 @@ if test "${enable_dump_share+set}" = set; then
   enableval=$enable_dump_share; if test "x$enableval" = xno; then
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_DUMP_SHARE
+#define NO_DUMP_SHARE /**/
 _ACEOF
 
 fi
@@ -5475,7 +5778,7 @@ if test "${with_epsfwin+set}" = set; then
   withval=$with_epsfwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define EPSFWIN
+#define EPSFWIN /**/
 _ACEOF
 
 fi
@@ -5488,7 +5791,7 @@ if test "${with_hp2627win+set}" = set; then
   withval=$with_hp2627win; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HP2627WIN
+#define HP2627WIN /**/
 _ACEOF
 
 fi
@@ -5501,7 +5804,7 @@ if test "${with_mftalkwin+set}" = set; then
   withval=$with_mftalkwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define MFTALKWIN
+#define MFTALKWIN /**/
 _ACEOF
 
 fi
@@ -5514,7 +5817,7 @@ if test "${with_nextwin+set}" = set; then
   withval=$with_nextwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define NEXTWIN
+#define NEXTWIN /**/
 _ACEOF
 
 fi
@@ -5527,7 +5830,7 @@ if test "${with_regiswin+set}" = set; then
   withval=$with_regiswin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define REGISWIN
+#define REGISWIN /**/
 _ACEOF
 
 fi
@@ -5541,7 +5844,7 @@ if test "${with_suntoolswin+set}" = set; then
   wlibs="-lsuntool -lsunwindow -lpixrect $wlibs"
 
 cat >>confdefs.h <<\_ACEOF
-#define SUNWIN
+#define SUNWIN /**/
 _ACEOF
 
 fi
@@ -5554,7 +5857,7 @@ if test "${with_tektronixwin+set}" = set; then
   withval=$with_tektronixwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define TEKTRONIXWIN
+#define TEKTRONIXWIN /**/
 _ACEOF
 
 fi
@@ -5567,7 +5870,7 @@ if test "${with_unitermwin+set}" = set; then
   withval=$with_unitermwin; if test "x$withval" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define UNITERMWIN
+#define UNITERMWIN /**/
 _ACEOF
 
 fi
@@ -5580,9 +5883,9 @@ fi
 # Check whether --with-x-toolkit was given.
 if test "${with_x_toolkit+set}" = set; then
   withval=$with_x_toolkit;
-    { echo "$as_me:$LINENO: WARNING: the --with-x-toolkit option is obsolete; please use --with-mf-x-toolkit
+    { $as_echo "$as_me:$LINENO: WARNING: the --with-x-toolkit option is obsolete; please use --with-mf-x-toolkit
 and/or --with-xdvi-x-toolkit instead. (Assuming default toolkit.)" >&5
-echo "$as_me: WARNING: the --with-x-toolkit option is obsolete; please use --with-mf-x-toolkit
+$as_echo "$as_me: WARNING: the --with-x-toolkit option is obsolete; please use --with-mf-x-toolkit
 and/or --with-xdvi-x-toolkit instead. (Assuming default toolkit.)" >&2;}
     with_xdvi_x_toolkit=yes
     with_mf_x_toolkit=yes
@@ -5613,8 +5916,8 @@ if test "${with_mf_x_toolkit+set}" = set; then
             y | ye | yes )      val=yes ;;
             n | no )            val=no  ;;
             * )
-{ echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&5
-echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&5
+$as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$withval'; using yes." >&2;}
               val=yes;;
           esac
           with_mf_x_toolkit=$val
@@ -5623,8 +5926,8 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -5632,8 +5935,8 @@ else
   USE_MAINTAINER_MODE=no
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
   if test "x$USE_MAINTAINER_MODE" = xyes; then
     MAINT=
   else
@@ -5642,10 +5945,10 @@ echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
 
 
 
-{ echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
-echo $ECHO_N "checking for loader (symbol LD)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
+$as_echo_n "checking for loader (symbol LD)... " >&6; }
 if test "${cf_cv_subst_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$LD" && LD=ld
@@ -5653,14 +5956,14 @@ cf_cv_subst_LD=$LD
 fi
 
 LD=${cf_cv_subst_LD}
-{ echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
-echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
+$as_echo_n "checking for archiver (symbol AR)... " >&6; }
 if test "${cf_cv_subst_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$AR" && AR=ar
@@ -5668,14 +5971,14 @@ cf_cv_subst_AR=$AR
 fi
 
 AR=${cf_cv_subst_AR}
-{ echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
-echo $ECHO_N "checking for archiver options (symbol ARFLAGS)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
+$as_echo_n "checking for archiver options (symbol ARFLAGS)... " >&6; }
 if test "${cf_cv_subst_ARFLAGS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 test -z "$ARFLAGS" && ARFLAGS=rc
@@ -5683,8 +5986,8 @@ cf_cv_subst_ARFLAGS=$ARFLAGS
 fi
 
 ARFLAGS=${cf_cv_subst_ARFLAGS}
-{ echo "$as_me:$LINENO: result: $ARFLAGS" >&5
-echo "${ECHO_T}$ARFLAGS" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ARFLAGS" >&5
+$as_echo "$ARFLAGS" >&6; }
 
 
 
@@ -5743,8 +6046,8 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking where the main texmf tree is located" >&5
-echo $ECHO_N "checking where the main texmf tree is located... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking where the main texmf tree is located" >&5
+$as_echo_n "checking where the main texmf tree is located... " >&6; }
 case $prefix in
   */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
 esac
@@ -5756,12 +6059,12 @@ if test "x$datadir" != 'x${prefix}/share'; then
   texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'`
   # ... do complain if it wasn't found.
   if test -d "$texmfmain"; then
-    { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
-echo "${ECHO_T}\"$texmfmain\"" >&6; }
+    { $as_echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
+$as_echo "\"$texmfmain\"" >&6; }
   else
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-    { echo "$as_me:$LINENO: WARNING: No texmf tree found at $texmfmain.
+    { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: No texmf tree found at $texmfmain.
   *****************************************************************
   * Error: The main texmf tree was not found.                     *
   * If you do not have the files, you should be able to them from *
@@ -5769,7 +6072,7 @@ echo "${ECHO_T}not found" >&6; }
   * CTAN hosts.                                                   *
   *****************************************************************
   Winging it." >&5
-echo "$as_me: WARNING: No texmf tree found at $texmfmain.
+$as_echo "$as_me: WARNING: No texmf tree found at $texmfmain.
   *****************************************************************
   * Error: The main texmf tree was not found.                     *
   * If you do not have the files, you should be able to them from *
@@ -5798,13 +6101,13 @@ else
   fi
   texmfmain=`echo "$texmfmain" | sed 's,//*,/,g'`
   if test -n "$texmfmain"; then
-    { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
-echo "${ECHO_T}\"$texmfmain\"" >&6; }
+    { $as_echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
+$as_echo "\"$texmfmain\"" >&6; }
   else
     eval texmfmain="$datadir/texmf"
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-    { echo "$as_me:$LINENO: WARNING: The main texmf tree was not found at $texmfmain.
+    { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: The main texmf tree was not found at $texmfmain.
   *****************************************************************
   * Error: The main texmf tree was not found.                     *
   * Use the --datadir option to specify its parent directory.     *
@@ -5813,7 +6116,7 @@ echo "${ECHO_T}not found" >&6; }
   * CTAN hosts.                                                   *
   *****************************************************************
   Winging it by pretending $texmfmain is correct." >&5
-echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain.
+$as_echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain.
   *****************************************************************
   * Error: The main texmf tree was not found.                     *
   * Use the --datadir option to specify its parent directory.     *
@@ -5897,10 +6200,10 @@ else
 
   if test "$with_system_zlib" = yes; then
 
-{ echo "$as_me:$LINENO: checking for inflate in -lz" >&5
-echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+$as_echo_n "checking for inflate in -lz... " >&6; }
 if test "${ac_cv_lib_z_inflate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
@@ -5932,32 +6235,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_z_inflate=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_z_inflate=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6; }
+{ $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
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
@@ -5966,8 +6273,8 @@ _ACEOF
   LIBS="-lz $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
       with_system_zlib=no
 fi
 
@@ -5977,20 +6284,21 @@ fi
 
 for ac_header in zlib.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6006,32 +6314,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6045,69 +6354,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -6115,8 +6427,8 @@ fi
 done
 
     if test "$ac_cv_header_zlib_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
-echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
+$as_echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
       with_system_zlib=no
     fi
   fi
@@ -6168,10 +6480,10 @@ else
   CPP="$CPP $EXTRA_LIBPNG_INCLUDE"
 
   if test "$with_system_pnglib" = yes; then
-      { echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5
-echo $ECHO_N "checking for png_set_read_fn in -lpng... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5
+$as_echo_n "checking for png_set_read_fn in -lpng... " >&6; }
 if test "${ac_cv_lib_png_png_set_read_fn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
@@ -6203,37 +6515,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_png_png_set_read_fn=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_png_png_set_read_fn=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_set_read_fn" >&6; }
+{ $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
   pnglib=-lpng
 else
-  { echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;}
         with_system_pnglib=no
 fi
 
@@ -6336,10 +6652,10 @@ else
 
   if test "$with_system_freetype2" = yes; then
 
-{ echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
-echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
+$as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
 if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfreetype  $LIBS"
@@ -6371,32 +6687,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_freetype_FT_Init_FreeType=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_freetype_FT_Init_FreeType=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
-echo "${ECHO_T}$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
+{ $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
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBFREETYPE 1
@@ -6405,8 +6725,8 @@ _ACEOF
   LIBS="-lfreetype $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard FreeType2 library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard FreeType2 library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard FreeType2 library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard FreeType2 library not found. Compiling my own." >&2;}
       with_system_freetype2=no
 fi
 
@@ -6416,20 +6736,21 @@ fi
 
 for ac_header in ft2build.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6445,32 +6766,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6484,69 +6806,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -6554,8 +6879,8 @@ fi
 done
 
     if test "$ac_cv_header_ft2build_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: ft2build.h not found. Using my own freetype2 sources." >&5
-echo "$as_me: WARNING: ft2build.h not found. Using my own freetype2 sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: ft2build.h not found. Using my own freetype2 sources." >&5
+$as_echo "$as_me: WARNING: ft2build.h not found. Using my own freetype2 sources." >&2;}
       with_system_freetype2=no
     fi
   fi
@@ -6597,12 +6922,9 @@ fi
 
 
 
-
-# Check whether --with-system_icu was given.
-if test "${with_system_icu+set}" = set; then
-  withval=$with_system_icu;
-fi
-
+# Not available because xetex uses a customized ICU layout engine
+# AC_ARG_WITH(system_icu,
+# [  --with-system-icu        use installed ICU library])
 
 
 # Check whether --with-icu_libdir was given.
@@ -6626,7 +6948,7 @@ else
   EXTRA_ICU_INCLUDE=
   EXTRA_ICU_LIBDIR=
 
-  if test "$with_system_icu" = yes; then
+  if test x"$with_system_icu" = xyes; then
     if test "x$with_icu_libdir" != x; then
       EXTRA_ICU_LIBDIR="-L$with_icu_libdir"
     fi
@@ -6642,12 +6964,12 @@ else
   LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
   CPP="$CPP $EXTRA_ICU_INCLUDE"
 
-  if test "$with_system_icu" = yes; then
+  if test x"$with_system_icu" = xyes; then
 
-{ echo "$as_me:$LINENO: checking for ubidi_open in -licuuc" >&5
-echo $ECHO_N "checking for ubidi_open in -licuuc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ubidi_open in -licuuc" >&5
+$as_echo_n "checking for ubidi_open in -licuuc... " >&6; }
 if test "${ac_cv_lib_icuuc_ubidi_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-licuuc  $LIBS"
@@ -6679,32 +7001,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_icuuc_ubidi_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_icuuc_ubidi_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_icuuc_ubidi_open" >&5
-echo "${ECHO_T}$ac_cv_lib_icuuc_ubidi_open" >&6; }
+{ $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
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBICUUC 1
@@ -6713,31 +7039,32 @@ _ACEOF
   LIBS="-licuuc $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard ICU library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard ICU library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard ICU library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard ICU library not found. Compiling my own." >&2;}
       with_system_icu=no
 fi
 
   fi
 
-  if test "$with_system_icu" = yes; then
+  if test x"$with_system_icu" = xyes; then
 
 for ac_header in ubidi.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6753,32 +7080,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6792,69 +7120,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+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; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -6862,8 +7193,8 @@ fi
 done
 
     if test "$ac_cv_header_ubidi_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: ubidi.h not found. Using my own ICU sources." >&5
-echo "$as_me: WARNING: ubidi.h not found. Using my own ICU sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: ubidi.h not found. Using my own ICU sources." >&5
+$as_echo "$as_me: WARNING: ubidi.h not found. Using my own ICU sources." >&2;}
       with_system_icu=no
     fi
   fi
@@ -6872,7 +7203,7 @@ echo "$as_me: WARNING: ubidi.h not found. Using my own ICU sources." >&2;}
   CPP=$OLD_CPP
   LIBS=$OLD_LIBS
 
-  if test "$with_system_icu" != yes; then
+  if test x"$with_system_icu" != xyes; then
     ICUCPPFLAGS='-I$(ICUDIR)/common -I$(ICUSRCDIR)/common -I$(ICUSRCDIR)/layout'
     LDICU='$(ICUDIR)/lib/libsicuuc.a $(ICUDIR)/lib/libsicule.a $(ICUDIR)/lib/libsicudata.a'
     ICUDEP='$(ICUDIR)/lib/libsicuuc.a $(ICUDIR)/lib/libsicule.a $(ICUDIR)/lib/libsicudata.a'
@@ -6920,8 +7251,8 @@ if test -d $srcdir/omegadir; then
   test "${with_omega+set}" = set || with_omega=yes
 else
   if test "x$with_omega" = xyes; then
-    { echo "$as_me:$LINENO: WARNING: The Omega sources are not available." >&5
-echo "$as_me: WARNING: The Omega sources are not available." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: The Omega sources are not available." >&5
+$as_echo "$as_me: WARNING: The Omega sources are not available." >&2;}
   fi
   with_omega=no
 fi
@@ -6942,8 +7273,8 @@ if test -d $srcdir/alephdir && test -d $srcdir/omegadir; then
   test "${with_aleph+set}" = set || with_aleph=yes
 else
   if test "x$with_aleph" = xyes; then
-    { echo "$as_me:$LINENO: WARNING: The Aleph sources are not available." >&5
-echo "$as_me: WARNING: The Aleph sources are not available." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: The Aleph sources are not available." >&5
+$as_echo "$as_me: WARNING: The Aleph sources are not available." >&2;}
   fi
   with_aleph=no
 fi
@@ -6961,8 +7292,8 @@ if test -d $srcdir/pdftexdir; then
   test "${with_pdftex+set}" = set || with_pdftex=yes
 else
   if test "x$with_pdftex" = xyes; then
-    { echo "$as_me:$LINENO: WARNING: The pdfTeX sources are not available." >&5
-echo "$as_me: WARNING: The pdfTeX sources are not available." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: The pdfTeX sources are not available." >&5
+$as_echo "$as_me: WARNING: The pdfTeX sources are not available." >&2;}
   fi
   with_pdftex=no
 fi
@@ -6972,26 +7303,40 @@ if test -d $srcdir/pdftexdir; then
   test "${with_pdfetex+set}" = set || with_pdfetex=yes
 else
   if test "x$with_pdfetex" = xyes; then
-    { echo "$as_me:$LINENO: WARNING: Not all sources of pdfeTeX are available." >&5
-echo "$as_me: WARNING: Not all sources of pdfeTeX are available." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Not all sources of pdfeTeX are available." >&5
+$as_echo "$as_me: WARNING: Not all sources of pdfeTeX are available." >&2;}
   fi
   with_pdfetex=no
 fi
 
+# For luaTeX.
+if test -d $srcdir/luatexdir; then
+  # Create build dir, if necessary.
+  test -d luatexdir || mkdir luatexdir
+  test "${with_luatex+set}" = set || with_luatex=yes
+else
+  if test "x$with_luatex" = xyes; then
+    { $as_echo "$as_me:$LINENO: WARNING: The luaTeX sources are not available." >&5
+$as_echo "$as_me: WARNING: The luaTeX sources are not available." >&2;}
+  fi
+  with_luatex=no
+fi
+
 # For XeTeX
 if test -d $srcdir/xetexdir \
     && test -d $srcdir/etexdir; then
   test "${with_xetex+set}" = set || with_xetex=yes
 else
   if test "x$with_xetex" = xyes; then
-    { echo "$as_me:$LINENO: WARNING: Not all sources of XeTeX are available." >&5
-echo "$as_me: WARNING: Not all sources of XeTeX are available." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Not all sources of XeTeX are available." >&5
+$as_echo "$as_me: WARNING: Not all sources of XeTeX are available." >&2;}
   fi
   with_xetex=no
 fi
 
 # Check whether C++ compiler works.  Prevent exit if it doesn't.
 if test "x$with_pdftex"  = xyes ||
+   test "x$with_luatex"  = xyes ||
    test "x$with_pdfetex" = xyes ||
    test "x$with_xetex"   = xyes
 then
@@ -7012,10 +7357,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -7028,7 +7373,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7039,11 +7384,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7056,10 +7401,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -7072,7 +7417,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7083,11 +7428,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7099,10 +7444,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -7114,43 +7459,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7176,20 +7525,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -7199,15 +7549,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -7234,20 +7588,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -7272,20 +7627,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -7311,20 +7667,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -7339,8 +7696,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -7377,10 +7734,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -7393,7 +7750,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7404,11 +7761,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7421,10 +7778,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -7437,7 +7794,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7448,11 +7805,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7464,10 +7821,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $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
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$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;}
 ac_tool_warned=yes ;;
@@ -7479,43 +7836,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7541,20 +7902,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -7564,15 +7926,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -7599,20 +7965,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -7637,20 +8004,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -7676,20 +8044,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -7704,8 +8073,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -7729,16 +8098,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 } || {
   test "x$with_pdftex" = xyes \
-    && { echo "$as_me:$LINENO: WARNING: No C++ compiler: pdfTeX will not be compiled." >&5
-echo "$as_me: WARNING: No C++ compiler: pdfTeX will not be compiled." >&2;}
+    && { $as_echo "$as_me:$LINENO: WARNING: No C++ compiler: pdfTeX will not be compiled." >&5
+$as_echo "$as_me: WARNING: No C++ compiler: pdfTeX will not be compiled." >&2;}
   test "x$with_pdfetex" = xyes \
-    && { echo "$as_me:$LINENO: WARNING: No C++ compiler: pdfeTeX will not be compiled." >&5
-echo "$as_me: WARNING: No C++ compiler: pdfeTeX will not be compiled." >&2;}
+    && { $as_echo "$as_me:$LINENO: WARNING: No C++ compiler: pdfeTeX will not be compiled." >&5
+$as_echo "$as_me: WARNING: No C++ compiler: pdfeTeX will not be compiled." >&2;}
+  test "x$with_luatex" = xyes \
+    && { $as_echo "$as_me:$LINENO: WARNING: No C++ compiler: luaTeX will not be compiled." >&5
+$as_echo "$as_me: WARNING: No C++ compiler: luaTeX will not be compiled." >&2;}
   test "x$with_xetex" = xyes \
-    && { echo "$as_me:$LINENO: WARNING: No C++ compiler: XeTeX will not be compiled." >&5
-echo "$as_me: WARNING: No C++ compiler: XeTeX will not be compiled." >&2;}
+    && { $as_echo "$as_me:$LINENO: WARNING: No C++ compiler: XeTeX will not be compiled." >&5
+$as_echo "$as_me: WARNING: No C++ compiler: XeTeX will not be compiled." >&2;}
   with_pdftex=no
   with_pdfetex=no
+  with_luatex=no
   with_xetex=no
   true
 }
@@ -7756,11 +8129,12 @@ CXXHACKLINK='$(kpathsea_cxx_link)'
 CXXHACKLDLIBS='$(LOADLIBES)'
 if test "x$with_cxx_runtime_hack" = xyes &&
    { test "x$with_pdftex"  = xyes ||
+     test "x$with_luatex"  = xyes ||
      test "x$with_pdfetex" = xyes ||
      test "x$with_xetex"   = xyes; }
 then
-  { echo "$as_me:$LINENO: checking for statically linking C++ runtime library" >&5
-echo $ECHO_N "checking for statically linking C++ runtime library... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for statically linking C++ runtime library" >&5
+$as_echo_n "checking for statically linking C++ runtime library... " >&6; }
 
   cpp_link_hack=false
   old_flags=$flags
@@ -7795,11 +8169,11 @@ EOF
     CXXLDEXTRA=$flags
     CXXHACKLINK='$(cxx_link_command)'
     CXXHACKLDLIBS='$(proglib) $(kpathsea_dir)/.libs/libkpathsea.a $(LIBS) $(XLOADLIBES)'
-    { echo "$as_me:$LINENO: result: ok using $flags" >&5
-echo "${ECHO_T}ok using $flags" >&6; }
+    { $as_echo "$as_me:$LINENO: result: ok using $flags" >&5
+$as_echo "ok using $flags" >&6; }
   else
-    { echo "$as_me:$LINENO: result: not supported" >&5
-echo "${ECHO_T}not supported" >&6; }
+    { $as_echo "$as_me:$LINENO: result: not supported" >&5
+$as_echo "not supported" >&6; }
   fi
 
   flags=$old_flags
@@ -7824,6 +8198,13 @@ else
 fi
 
 
+if test "x$with_luatex" = xyes; then
+  LTEX=
+else
+  LTEX='#! '
+fi
+
+
 if test "x$with_xetex" = xyes; then
   XETEX=
 else
@@ -7936,34 +8317,34 @@ fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -7980,27 +8361,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -8040,8 +8421,8 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
         save_LIBS="$LIBS"
         LIBS="$PTHREAD_LIBS $LIBS"
-        { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
+$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8070,30 +8451,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   acx_pthread_ok=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-        { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
-echo "${ECHO_T}$acx_pthread_ok" >&6; }
+        { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
+$as_echo "$acx_pthread_ok" >&6; }
         if test x"$acx_pthread_ok" = xno; then
                 PTHREAD_LIBS=""
                 PTHREAD_CFLAGS=""
@@ -8154,23 +8539,23 @@ for flag in $acx_pthread_flags; do
 
         case $flag in
                 none)
-                { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
-echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; }
+                { $as_echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
+$as_echo_n "checking whether pthreads work without any flags... " >&6; }
                 ;;
 
                 -*)
-                { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }
+                { $as_echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
+$as_echo_n "checking whether pthreads work with $flag... " >&6; }
                 PTHREAD_CFLAGS="$flag"
                 ;;
 
 		pthread-config)
 		# Extract the first word of "pthread-config", so it can be a program name with args.
 set dummy pthread-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_acx_pthread_config+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$acx_pthread_config"; then
   ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.
@@ -8183,7 +8568,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_acx_pthread_config="yes"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8195,11 +8580,11 @@ fi
 fi
 acx_pthread_config=$ac_cv_prog_acx_pthread_config
 if test -n "$acx_pthread_config"; then
-  { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5
-echo "${ECHO_T}$acx_pthread_config" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $acx_pthread_config" >&5
+$as_echo "$acx_pthread_config" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8209,8 +8594,8 @@ fi
 		;;
 
                 *)
-                { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
-echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }
+                { $as_echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
                 PTHREAD_LIBS="-l$flag"
                 ;;
         esac
@@ -8252,34 +8637,38 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   acx_pthread_ok=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
 
-        { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
-echo "${ECHO_T}$acx_pthread_ok" >&6; }
+        { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
+$as_echo "$acx_pthread_ok" >&6; }
         if test "x$acx_pthread_ok" = xyes; then
                 break;
         fi
@@ -8297,8 +8686,8 @@ if test "x$acx_pthread_ok" = xyes; then
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 
         # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-	{ echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
-echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
+$as_echo_n "checking for joinable pthread attribute... " >&6; }
 	attr_name=unknown
 	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
 	    cat >conftest.$ac_ext <<_ACEOF
@@ -8322,31 +8711,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   attr_name=$attr; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 	done
-        { echo "$as_me:$LINENO: result: $attr_name" >&5
-echo "${ECHO_T}$attr_name" >&6; }
+        { $as_echo "$as_me:$LINENO: result: $attr_name" >&5
+$as_echo "$attr_name" >&6; }
         if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
 
 cat >>confdefs.h <<_ACEOF
@@ -8355,15 +8748,15 @@ _ACEOF
 
         fi
 
-        { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
-echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
         flag=no
         case "${host_cpu}-${host_os}" in
             *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
             *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
         esac
-        { echo "$as_me:$LINENO: result: ${flag}" >&5
-echo "${ECHO_T}${flag}" >&6; }
+        { $as_echo "$as_me:$LINENO: result: ${flag}" >&5
+$as_echo "${flag}" >&6; }
         if test "x$flag" != xno; then
             PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
         fi
@@ -8377,10 +8770,10 @@ echo "${ECHO_T}${flag}" >&6; }
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$PTHREAD_CC"; then
   ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
@@ -8393,7 +8786,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_PTHREAD_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8404,11 +8797,11 @@ fi
 fi
 PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
 if test -n "$PTHREAD_CC"; then
-  { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
-echo "${ECHO_T}$PTHREAD_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
+$as_echo "$PTHREAD_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8461,8 +8854,8 @@ if test "x$with_xetex" = xyes; then
 #
 #   Check for Carbon framework on Mac OS X
 #
-  { echo "$as_me:$LINENO: checking for Apple Carbon framework" >&5
-echo $ECHO_N "checking for Apple Carbon framework... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for Apple Carbon framework" >&5
+$as_echo_n "checking for Apple Carbon framework... " >&6; }
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8488,19 +8881,20 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_CARBON 1
@@ -8510,11 +8904,11 @@ _ACEOF
       has_carbon=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
       LDCARBON=
       has_carbon=no
 
@@ -8550,8 +8944,8 @@ fi
 
 fi
 
-  { echo "$as_me:$LINENO: checking for fontconfig header files" >&5
-echo $ECHO_N "checking for fontconfig header files... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for fontconfig header files" >&5
+$as_echo_n "checking for fontconfig header files... " >&6; }
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8577,23 +8971,24 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-      { echo "$as_me:$LINENO: checking for FcInit in -lfontconfig" >&5
-echo $ECHO_N "checking for FcInit in -lfontconfig... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for FcInit in -lfontconfig" >&5
+$as_echo_n "checking for FcInit in -lfontconfig... " >&6; }
 if test "${ac_cv_lib_fontconfig_FcInit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfontconfig  $LIBS"
@@ -8625,32 +9020,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_fontconfig_FcInit=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_fontconfig_FcInit=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcInit" >&5
-echo "${ECHO_T}$ac_cv_lib_fontconfig_FcInit" >&6; }
+{ $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
 
 
@@ -8664,11 +9063,11 @@ fi
 
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
       CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
       LDFONTCONFIG=
 
@@ -8678,12 +9077,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "x$LDFONTCONFIG" = "x"; then
-      { { echo "$as_me:$LINENO: error:
+      { { $as_echo "$as_me:$LINENO: error:
 Cannot build XeTeX without libfontconfig.
 Use the --with-fontconfig=DIR option to specify the prefix where
 fontconfig is installed.
       " >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 Cannot build XeTeX without libfontconfig.
 Use the --with-fontconfig=DIR option to specify the prefix where
 fontconfig is installed.
@@ -8708,8 +9107,8 @@ if test -d $srcdir/etexdir; then
   test "${with_etex+set}" = set || with_etex=yes
 else
   if test "x$with_etex" = xyes; then
-    { echo "$as_me:$LINENO: WARNING: The e-TeX sources are not available." >&5
-echo "$as_me: WARNING: The e-TeX sources are not available." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: The e-TeX sources are not available." >&5
+$as_echo "$as_me: WARNING: The e-TeX sources are not available." >&2;}
   fi
   with_etex=no
 fi
@@ -8722,8 +9121,8 @@ fi
 
 
 # --with-x* options: Distinguish no X at all, no toolkit, or toolkit.
-{ echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
 
 
 # Check whether --with-x was given.
@@ -8737,11 +9136,11 @@ if test "x$with_x" = xno; then
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
@@ -8762,7 +9161,7 @@ _ACEOF
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib la dll; do
       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
@@ -8837,13 +9236,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -8851,7 +9251,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
@@ -8892,30 +9292,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
+  for ac_extension in a so sl dylib la dll; do
     if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
@@ -8924,6 +9327,7 @@ do
 done
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
@@ -8946,8 +9350,8 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
@@ -8957,8 +9361,8 @@ else
   ac_cv_have_x="have_x=yes\
 	ac_x_includes='$x_includes'\
 	ac_x_libraries='$x_libraries'"
-  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
 if test "$no_x" = yes; then
@@ -8979,8 +9383,8 @@ else
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+$as_echo_n "checking whether -R must be followed by a space... " >&6; }
     ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
     ac_xsave_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
@@ -9005,23 +9409,26 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
        X_LIBS="$X_LIBS -R$x_libraries"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
@@ -9046,33 +9453,38 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	  X_LIBS="$X_LIBS -R $x_libraries"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
+$as_echo "neither works" >&6; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     ac_c_werror_flag=$ac_xsave_c_werror_flag
@@ -9118,27 +9530,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
@@ -9170,41 +9585,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dnet_dnet_ntoa=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+{ $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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
@@ -9236,32 +9655,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+{ $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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
@@ -9269,6 +9692,7 @@ fi
     fi
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
@@ -9281,10 +9705,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+$as_echo_n "checking for gethostbyname... " >&6; }
 if test "${ac_cv_func_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9337,37 +9761,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_gethostbyname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
 
     if test $ac_cv_func_gethostbyname = no; then
-      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
@@ -9399,41 +9827,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_nsl_gethostbyname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
+{ $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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
@@ -9465,32 +9897,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_bsd_gethostbyname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+{ $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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
@@ -9505,10 +9941,10 @@ fi
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    { echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
 if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9561,37 +9997,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
 
     if test $ac_cv_func_connect = no; then
-      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
 if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
@@ -9623,32 +10063,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_socket_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_socket_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+{ $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
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
@@ -9656,10 +10100,10 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    { echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for remove" >&5
+$as_echo_n "checking for remove... " >&6; }
 if test "${ac_cv_func_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9712,37 +10156,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_remove=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_remove=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+$as_echo "$ac_cv_func_remove" >&6; }
 
     if test $ac_cv_func_remove = no; then
-      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
 if test "${ac_cv_lib_posix_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
@@ -9774,32 +10222,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_posix_remove=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_posix_remove=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+{ $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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
@@ -9807,10 +10259,10 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    { echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+$as_echo_n "checking for shmat... " >&6; }
 if test "${ac_cv_func_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9863,37 +10315,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shmat=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shmat=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+$as_echo "$ac_cv_func_shmat" >&6; }
 
     if test $ac_cv_func_shmat = no; then
-      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
@@ -9925,32 +10381,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ipc_shmat=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ipc_shmat=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+{ $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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
@@ -9967,10 +10427,10 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
@@ -10002,32 +10462,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ICE_IceConnectionNumber=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+{ $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
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
@@ -10044,10 +10508,10 @@ if test "x$with_x" = xyes; then
     wlibs="-lX11 $wlibs"
   fi
   if test -z "$x_ext_lib"; then # allow envvar override
-    { echo "$as_me:$LINENO: checking for XextCreateExtension in -lXext" >&5
-echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for XextCreateExtension in -lXext" >&5
+$as_echo_n "checking for XextCreateExtension in -lXext... " >&6; }
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext $wlibs $X_EXTRA_LIBS $XLFLAG $LIBS"
@@ -10079,32 +10543,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_Xext_XextCreateExtension=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6; }
+{ $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
   x_ext_lib=-lXext
 else
@@ -10153,14 +10621,21 @@ ac_config_files="$ac_config_files pdftexdir/Makefile:pdftexdir/Makefile.aux"
 
 fi
 
+# Ditto luatex.
+if test "$with_luatex" = yes; then
+  ac_config_files="$ac_config_files luatexdir/Makefile.aux:luatexdir/Makefile.in"
+ac_config_files="$ac_config_files luatexdir/Makefile:luatexdir/Makefile.aux"
+
+fi
+
 test -d tests || mkdir tests
 
 # Is libm present.  FIXME: do we need it at all?
 
-{ echo "$as_me:$LINENO: checking for main in -lm" >&5
-echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for main in -lm" >&5
+$as_echo_n "checking for main in -lm... " >&6; }
 if test "${ac_cv_lib_m_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
@@ -10186,32 +10661,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_m_main=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_m_main=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
-echo "${ECHO_T}$ac_cv_lib_m_main" >&6; }
+{ $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
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -10231,12 +10710,12 @@ if test "$cross_compiling" = yes; then
   if test -z "${BUILDCC}"; then
     BUILDCC='cc'
   fi
-  { echo "$as_me:$LINENO: result: setting \$BUILDCC to ${BUILDCC}" >&5
-echo "${ECHO_T}setting \$BUILDCC to ${BUILDCC}" >&6; }
+  { $as_echo "$as_me:$LINENO: result: setting \$BUILDCC to ${BUILDCC}" >&5
+$as_echo "setting \$BUILDCC to ${BUILDCC}" >&6; }
 else
   if test -n "${BUILDCC}"; then
-    { echo "$as_me:$LINENO: WARNING: \$BUILDCC set but not cross-compiling." >&5
-echo "$as_me: WARNING: \$BUILDCC set but not cross-compiling." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \$BUILDCC set but not cross-compiling." >&5
+$as_echo "$as_me: WARNING: \$BUILDCC set but not cross-compiling." >&2;}
   fi
   BUILDCC='$(CC)'
 fi
@@ -10246,12 +10725,12 @@ if test "$cross_compiling" = yes; then
   if test -z "${BUILDCFLAGS}"; then
     BUILDCFLAGS='$(BUILDXCFLAGS)'
   fi
-  { echo "$as_me:$LINENO: result: setting \$BUILDCFLAGS to ${BUILDCFLAGS}" >&5
-echo "${ECHO_T}setting \$BUILDCFLAGS to ${BUILDCFLAGS}" >&6; }
+  { $as_echo "$as_me:$LINENO: result: setting \$BUILDCFLAGS to ${BUILDCFLAGS}" >&5
+$as_echo "setting \$BUILDCFLAGS to ${BUILDCFLAGS}" >&6; }
 else
   if test -n "${BUILDCFLAGS}"; then
-    { echo "$as_me:$LINENO: WARNING: \$BUILDCFLAGS set but not cross-compiling." >&5
-echo "$as_me: WARNING: \$BUILDCFLAGS set but not cross-compiling." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \$BUILDCFLAGS set but not cross-compiling." >&5
+$as_echo "$as_me: WARNING: \$BUILDCFLAGS set but not cross-compiling." >&2;}
   fi
   BUILDCFLAGS='$(CFLAGS)'
 fi
@@ -10261,12 +10740,12 @@ if test "$cross_compiling" = yes; then
   if test -z "${BUILDCPPFLAGS}"; then
     BUILDCPPFLAGS='$(BUILDXCPPFLAGS)'
   fi
-  { echo "$as_me:$LINENO: result: setting \$BUILDCPPFLAGS to ${BUILDCPPFLAGS}" >&5
-echo "${ECHO_T}setting \$BUILDCPPFLAGS to ${BUILDCPPFLAGS}" >&6; }
+  { $as_echo "$as_me:$LINENO: result: setting \$BUILDCPPFLAGS to ${BUILDCPPFLAGS}" >&5
+$as_echo "setting \$BUILDCPPFLAGS to ${BUILDCPPFLAGS}" >&6; }
 else
   if test -n "${BUILDCPPFLAGS}"; then
-    { echo "$as_me:$LINENO: WARNING: \$BUILDCPPFLAGS set but not cross-compiling." >&5
-echo "$as_me: WARNING: \$BUILDCPPFLAGS set but not cross-compiling." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \$BUILDCPPFLAGS set but not cross-compiling." >&5
+$as_echo "$as_me: WARNING: \$BUILDCPPFLAGS set but not cross-compiling." >&2;}
   fi
   BUILDCPPFLAGS='$(CPPFLAGS)'
 fi
@@ -10276,12 +10755,12 @@ if test "$cross_compiling" = yes; then
   if test -z "${BUILDLDFLAGS}"; then
     BUILDLDFLAGS='$(BUILDXLDFLAGS)'
   fi
-  { echo "$as_me:$LINENO: result: setting \$BUILDLDFLAGS to ${BUILDLDFLAGS}" >&5
-echo "${ECHO_T}setting \$BUILDLDFLAGS to ${BUILDLDFLAGS}" >&6; }
+  { $as_echo "$as_me:$LINENO: result: setting \$BUILDLDFLAGS to ${BUILDLDFLAGS}" >&5
+$as_echo "setting \$BUILDLDFLAGS to ${BUILDLDFLAGS}" >&6; }
 else
   if test -n "${BUILDLDFLAGS}"; then
-    { echo "$as_me:$LINENO: WARNING: \$BUILDLDFLAGS set but not cross-compiling." >&5
-echo "$as_me: WARNING: \$BUILDLDFLAGS set but not cross-compiling." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \$BUILDLDFLAGS set but not cross-compiling." >&5
+$as_echo "$as_me: WARNING: \$BUILDLDFLAGS set but not cross-compiling." >&2;}
   fi
   BUILDLDFLAGS='$(LDFLAGS)'
 fi
@@ -10291,12 +10770,12 @@ if test "$cross_compiling" = yes; then
   if test -z "${BUILDCCLD}"; then
     BUILDCCLD='$(BUILDCC)'
   fi
-  { echo "$as_me:$LINENO: result: setting \$BUILDCCLD to ${BUILDCCLD}" >&5
-echo "${ECHO_T}setting \$BUILDCCLD to ${BUILDCCLD}" >&6; }
+  { $as_echo "$as_me:$LINENO: result: setting \$BUILDCCLD to ${BUILDCCLD}" >&5
+$as_echo "setting \$BUILDCCLD to ${BUILDCCLD}" >&6; }
 else
   if test -n "${BUILDCCLD}"; then
-    { echo "$as_me:$LINENO: WARNING: \$BUILDCCLD set but not cross-compiling." >&5
-echo "$as_me: WARNING: \$BUILDCCLD set but not cross-compiling." >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \$BUILDCCLD set but not cross-compiling." >&5
+$as_echo "$as_me: WARNING: \$BUILDCCLD set but not cross-compiling." >&2;}
   fi
   BUILDCCLD='$(CCLD)'
 fi
@@ -10308,10 +10787,10 @@ fi
 if test "$cross_compiling" = yes; then
 # Extract the first word of "tangle", so it can be a program name with args.
 set dummy tangle; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TANGLEBOOT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TANGLEBOOT in
   [\\/]* | ?:[\\/]*)
@@ -10326,7 +10805,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TANGLEBOOT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10338,18 +10817,18 @@ esac
 fi
 TANGLEBOOT=$ac_cv_path_TANGLEBOOT
 if test -n "$TANGLEBOOT"; then
-  { echo "$as_me:$LINENO: result: $TANGLEBOOT" >&5
-echo "${ECHO_T}$TANGLEBOOT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TANGLEBOOT" >&5
+$as_echo "$TANGLEBOOT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test -z "${TANGLEBOOT}"; then
-  { { echo "$as_me:$LINENO: error: tangle was not found but is required when cross-compiling.
+  { { $as_echo "$as_me:$LINENO: error: tangle was not found but is required when cross-compiling.
   Install tangle or set \$TANGLEBOOT to the full pathname." >&5
-echo "$as_me: error: tangle was not found but is required when cross-compiling.
+$as_echo "$as_me: error: tangle was not found but is required when cross-compiling.
   Install tangle or set \$TANGLEBOOT to the full pathname." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10359,10 +10838,10 @@ fi
 if test "$cross_compiling" = yes; then
 # Extract the first word of "tangle", so it can be a program name with args.
 set dummy tangle; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TANGLE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TANGLE in
   [\\/]* | ?:[\\/]*)
@@ -10377,7 +10856,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TANGLE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10389,18 +10868,18 @@ esac
 fi
 TANGLE=$ac_cv_path_TANGLE
 if test -n "$TANGLE"; then
-  { echo "$as_me:$LINENO: result: $TANGLE" >&5
-echo "${ECHO_T}$TANGLE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TANGLE" >&5
+$as_echo "$TANGLE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test -z "${TANGLE}"; then
-  { { echo "$as_me:$LINENO: error: tangle was not found but is required when cross-compiling.
+  { { $as_echo "$as_me:$LINENO: error: tangle was not found but is required when cross-compiling.
   Install tangle or set \$TANGLE to the full pathname." >&5
-echo "$as_me: error: tangle was not found but is required when cross-compiling.
+$as_echo "$as_me: error: tangle was not found but is required when cross-compiling.
   Install tangle or set \$TANGLE to the full pathname." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10410,10 +10889,10 @@ fi
 if test "$cross_compiling" = yes; then
 # Extract the first word of "ctangle", so it can be a program name with args.
 set dummy ctangle; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CTANGLEBOOT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CTANGLEBOOT in
   [\\/]* | ?:[\\/]*)
@@ -10428,7 +10907,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CTANGLEBOOT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10440,18 +10919,18 @@ esac
 fi
 CTANGLEBOOT=$ac_cv_path_CTANGLEBOOT
 if test -n "$CTANGLEBOOT"; then
-  { echo "$as_me:$LINENO: result: $CTANGLEBOOT" >&5
-echo "${ECHO_T}$CTANGLEBOOT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CTANGLEBOOT" >&5
+$as_echo "$CTANGLEBOOT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test -z "${CTANGLEBOOT}"; then
-  { { echo "$as_me:$LINENO: error: ctangle was not found but is required when cross-compiling.
+  { { $as_echo "$as_me:$LINENO: error: ctangle was not found but is required when cross-compiling.
   Install ctangle or set \$CTANGLEBOOT to the full pathname." >&5
-echo "$as_me: error: ctangle was not found but is required when cross-compiling.
+$as_echo "$as_me: error: ctangle was not found but is required when cross-compiling.
   Install ctangle or set \$CTANGLEBOOT to the full pathname." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10461,10 +10940,10 @@ fi
 if test "$cross_compiling" = yes; then
 # Extract the first word of "ctangle", so it can be a program name with args.
 set dummy ctangle; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CTANGLE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CTANGLE in
   [\\/]* | ?:[\\/]*)
@@ -10479,7 +10958,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CTANGLE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10491,18 +10970,18 @@ esac
 fi
 CTANGLE=$ac_cv_path_CTANGLE
 if test -n "$CTANGLE"; then
-  { echo "$as_me:$LINENO: result: $CTANGLE" >&5
-echo "${ECHO_T}$CTANGLE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CTANGLE" >&5
+$as_echo "$CTANGLE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test -z "${CTANGLE}"; then
-  { { echo "$as_me:$LINENO: error: ctangle was not found but is required when cross-compiling.
+  { { $as_echo "$as_me:$LINENO: error: ctangle was not found but is required when cross-compiling.
   Install ctangle or set \$CTANGLE to the full pathname." >&5
-echo "$as_me: error: ctangle was not found but is required when cross-compiling.
+$as_echo "$as_me: error: ctangle was not found but is required when cross-compiling.
   Install ctangle or set \$CTANGLE to the full pathname." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10512,10 +10991,10 @@ fi
 if test "$cross_compiling" = yes; then
 # Extract the first word of "tie", so it can be a program name with args.
 set dummy tie; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TIE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TIE in
   [\\/]* | ?:[\\/]*)
@@ -10530,7 +11009,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TIE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10542,18 +11021,18 @@ esac
 fi
 TIE=$ac_cv_path_TIE
 if test -n "$TIE"; then
-  { echo "$as_me:$LINENO: result: $TIE" >&5
-echo "${ECHO_T}$TIE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TIE" >&5
+$as_echo "$TIE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test -z "${TIE}"; then
-  { { echo "$as_me:$LINENO: error: tie was not found but is required when cross-compiling.
+  { { $as_echo "$as_me:$LINENO: error: tie was not found but is required when cross-compiling.
   Install tie or set \$TIE to the full pathname." >&5
-echo "$as_me: error: tie was not found but is required when cross-compiling.
+$as_echo "$as_me: error: tie was not found but is required when cross-compiling.
   Install tie or set \$TIE to the full pathname." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10564,10 +11043,10 @@ if test "x$with_omega" = xyes || test "x$with_aleph" = xyes || test "x$with_xete
 if test "$cross_compiling" = yes; then
 # Extract the first word of "otangle", so it can be a program name with args.
 set dummy otangle; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_OTANGLE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $OTANGLE in
   [\\/]* | ?:[\\/]*)
@@ -10582,7 +11061,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_OTANGLE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10594,18 +11073,18 @@ esac
 fi
 OTANGLE=$ac_cv_path_OTANGLE
 if test -n "$OTANGLE"; then
-  { echo "$as_me:$LINENO: result: $OTANGLE" >&5
-echo "${ECHO_T}$OTANGLE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $OTANGLE" >&5
+$as_echo "$OTANGLE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test -z "${OTANGLE}"; then
-  { { echo "$as_me:$LINENO: error: otangle was not found but is required when cross-compiling.
+  { { $as_echo "$as_me:$LINENO: error: otangle was not found but is required when cross-compiling.
   Install otangle or set \$OTANGLE to the full pathname." >&5
-echo "$as_me: error: otangle was not found but is required when cross-compiling.
+$as_echo "$as_me: error: otangle was not found but is required when cross-compiling.
   Install otangle or set \$OTANGLE to the full pathname." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10665,11 +11144,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-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) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -10702,12 +11182,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -10723,7 +11203,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -10736,11 +11216,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -10753,7 +11234,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -10763,7 +11244,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -10785,17 +11266,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -10811,8 +11320,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -10835,7 +11342,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -10848,17 +11355,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -10880,7 +11380,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -10931,7 +11431,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -10959,7 +11459,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -10972,19 +11471,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -11009,10 +11511,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -11035,7 +11537,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -11048,14 +11550,14 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -11068,9 +11570,9 @@ Usage: $0 [OPTIONS] [FILE]...
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -11081,24 +11583,24 @@ $config_headers
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -11120,30 +11622,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -11162,30 +11670,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -11198,6 +11708,8 @@ do
     "otps/Makefile") CONFIG_FILES="$CONFIG_FILES otps/Makefile:otps/Makefile.aux" ;;
     "pdftexdir/Makefile.aux") CONFIG_FILES="$CONFIG_FILES pdftexdir/Makefile.aux:pdftexdir/Makefile.in" ;;
     "pdftexdir/Makefile") CONFIG_FILES="$CONFIG_FILES pdftexdir/Makefile:pdftexdir/Makefile.aux" ;;
+    "luatexdir/Makefile.aux") CONFIG_FILES="$CONFIG_FILES luatexdir/Makefile.aux:luatexdir/Makefile.in" ;;
+    "luatexdir/Makefile") CONFIG_FILES="$CONFIG_FILES luatexdir/Makefile:luatexdir/Makefile.aux" ;;
     "Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;;
     "doc/Makefile.aux") CONFIG_FILES="$CONFIG_FILES doc/Makefile.aux:doc/Makefile.in" ;;
@@ -11216,8 +11728,8 @@ do
     "window/Makefile") CONFIG_FILES="$CONFIG_FILES window/Makefile:window/Makefile.aux" ;;
     "fmtutil.cnf") CONFIG_FILES="$CONFIG_FILES fmtutil.cnf:fmtutil.in" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -11257,247 +11769,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-WEB2CVERSION!$WEB2CVERSION$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-LN_S!$LN_S$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-YACC!$YACC$ac_delim
-YFLAGS!$YFLAGS$ac_delim
-LEX!$LEX$ac_delim
-LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
-LEXLIB!$LEXLIB$ac_delim
-RANLIB!$RANLIB$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LD!$LD$ac_delim
-AR!$AR$ac_delim
-ARFLAGS!$ARFLAGS$ac_delim
-socketlibs!$socketlibs$ac_delim
-MAINT!$MAINT$ac_delim
-texmfmain!$texmfmain$ac_delim
-ZLIBCPPFLAGS!$ZLIBCPPFLAGS$ac_delim
-LDZLIB!$LDZLIB$ac_delim
-ZLIBDEP!$ZLIBDEP$ac_delim
-LIBPNGCPPFLAGS!$LIBPNGCPPFLAGS$ac_delim
-LDLIBPNG!$LDLIBPNG$ac_delim
-LIBPNGDEP!$LIBPNGDEP$ac_delim
-LIBXPDFCPPFLAGS!$LIBXPDFCPPFLAGS$ac_delim
-LDLIBXPDF!$LDLIBXPDF$ac_delim
-LIBXPDFDEP!$LIBXPDFDEP$ac_delim
-LIBOBSDCFLAGS!$LIBOBSDCFLAGS$ac_delim
-LDLIBOBSD!$LDLIBOBSD$ac_delim
-LIBOBSDDEP!$LIBOBSDDEP$ac_delim
-FREETYPE2CPPFLAGS!$FREETYPE2CPPFLAGS$ac_delim
-LDFREETYPE2!$LDFREETYPE2$ac_delim
-FREETYPE2DEP!$FREETYPE2DEP$ac_delim
-TECKITCPPFLAGS!$TECKITCPPFLAGS$ac_delim
-LDTECKIT!$LDTECKIT$ac_delim
-TECKITDEP!$TECKITDEP$ac_delim
-ICUCPPFLAGS!$ICUCPPFLAGS$ac_delim
-LDICU!$LDICU$ac_delim
-ICUDEP!$ICUDEP$ac_delim
-GRAPHITECPPFLAGS!$GRAPHITECPPFLAGS$ac_delim
-LDGRAPHITE!$LDGRAPHITE$ac_delim
-GRAPHITEDEP!$GRAPHITEDEP$ac_delim
-MFN!$MFN$ac_delim
-OMEGA!$OMEGA$ac_delim
-ALEPH!$ALEPH$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXLDEXTRA!$CXXLDEXTRA$ac_delim
-CXXHACKLINK!$CXXHACKLINK$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-CXXHACKLDLIBS!$CXXHACKLDLIBS$ac_delim
-PTEX!$PTEX$ac_delim
-PETEX!$PETEX$ac_delim
-XETEX!$XETEX$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-acx_pthread_config!$acx_pthread_config$ac_delim
-PTHREAD_CC!$PTHREAD_CC$ac_delim
-PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
-PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
-FONTCONFIGCPPFLAGS!$FONTCONFIGCPPFLAGS$ac_delim
-FONTCONFIGLDFLAGS!$FONTCONFIGLDFLAGS$ac_delim
-LDFONTCONFIG!$LDFONTCONFIG$ac_delim
-XETEX_MACOSX!$XETEX_MACOSX$ac_delim
-XETEX_GENERIC!$XETEX_GENERIC$ac_delim
-ETEX!$ETEX$ac_delim
-XMKMF!$XMKMF$ac_delim
-X_CFLAGS!$X_CFLAGS$ac_delim
-X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-X_LIBS!$X_LIBS$ac_delim
-X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-x_ext_lib!$x_ext_lib$ac_delim
-x_tool_libs!$x_tool_libs$ac_delim
-wlibs!$wlibs$ac_delim
-FMU!$FMU$ac_delim
-BUILDCC!$BUILDCC$ac_delim
-BUILDCFLAGS!$BUILDCFLAGS$ac_delim
-BUILDCPPFLAGS!$BUILDCPPFLAGS$ac_delim
-BUILDLDFLAGS!$BUILDLDFLAGS$ac_delim
-BUILDCCLD!$BUILDCCLD$ac_delim
-TANGLEBOOT!$TANGLEBOOT$ac_delim
-TANGLE!$TANGLE$ac_delim
-CTANGLEBOOT!$CTANGLEBOOT$ac_delim
-CTANGLE!$CTANGLE$ac_delim
-TIE!$TIE$ac_delim
-OTANGLE!$OTANGLE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$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
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -11513,19 +11921,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[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 {
+    # Replace #undef with comments.  This is necessary, for example,
+    # 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, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-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;;
@@ -11554,26 +12076,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -11583,7 +12117,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -11609,7 +12143,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -11618,7 +12152,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -11639,17 +12173,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -11689,12 +12223,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -11703,13 +12238,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -11723,15 +12259,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -11741,119 +12278,58 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
 
@@ -11866,8 +12342,8 @@ echo "$as_me: $ac_file is unchanged" >&6;}
     "omegafonts/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case omegafonts/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "omegafonts/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: omegafonts/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: omegafonts/Makefile.in" >&2;}
+    test -f "omegafonts/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: omegafonts/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: omegafonts/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "omegafonts/Makefile.in";;
   *) # Relative
@@ -11879,8 +12355,8 @@ echo "$as_me: error: cannot find input file: omegafonts/Makefile.in" >&2;}
       echo "$srcdir/omegafonts/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: omegafonts/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: omegafonts/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: omegafonts/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: omegafonts/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -11897,9 +12373,9 @@ echo "$as_me: error: cannot find input file: omegafonts/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`omegafonts/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`omegafonts/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`omegafonts/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`omegafonts/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -11936,8 +12412,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "otps/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case otps/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "otps/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: otps/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: otps/Makefile.in" >&2;}
+    test -f "otps/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: otps/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: otps/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "otps/Makefile.in";;
   *) # Relative
@@ -11949,8 +12425,8 @@ echo "$as_me: error: cannot find input file: otps/Makefile.in" >&2;}
       echo "$srcdir/otps/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: otps/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: otps/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: otps/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: otps/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -11967,9 +12443,9 @@ echo "$as_me: error: cannot find input file: otps/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`otps/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`otps/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`otps/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`otps/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12006,8 +12482,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "pdftexdir/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case pdftexdir/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "pdftexdir/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: pdftexdir/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: pdftexdir/Makefile.in" >&2;}
+    test -f "pdftexdir/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: pdftexdir/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: pdftexdir/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "pdftexdir/Makefile.in";;
   *) # Relative
@@ -12019,8 +12495,8 @@ echo "$as_me: error: cannot find input file: pdftexdir/Makefile.in" >&2;}
       echo "$srcdir/pdftexdir/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: pdftexdir/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: pdftexdir/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: pdftexdir/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: pdftexdir/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12037,9 +12513,9 @@ echo "$as_me: error: cannot find input file: pdftexdir/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`pdftexdir/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`pdftexdir/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`pdftexdir/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`pdftexdir/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12073,11 +12549,81 @@ 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
  ;;
+    "luatexdir/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
+  kpse_input=`case luatexdir/Makefile.in in
+  [\\/$]*) # Absolute
+    test -f "luatexdir/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: luatexdir/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: luatexdir/Makefile.in" >&2;}
+   { (exit 1); exit 1; }; }
+    echo "luatexdir/Makefile.in";;
+  *) # Relative
+    if test -f "luatexdir/Makefile.in"; then
+      # Build tree
+      echo "luatexdir/Makefile.in"
+    elif test -f "$srcdir/luatexdir/Makefile.in"; then
+      # Source tree
+      echo "$srcdir/luatexdir/Makefile.in"
+    else
+      # /dev/null tree
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: luatexdir/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: luatexdir/Makefile.in" >&2;}
+   { (exit 1); exit 1; }; }
+    fi;;
+  esac` || { (exit 1); exit 1; }
+# Replace lines of the form "kpse_include foo" with the contents of foo:
+# first, from the kpse_include lines construct a list of file names.
+# From that list, we construct a second list of those files that exist.
+# Then we construct a list of sed commands for including those files,
+# and a sed command that removes the kpse_include lines. We don't attempt
+# to read non-existent files because some (buggy) versions of sed choke
+# on this. Have to use sed because old (Ultrix, SunOs) awk does not support
+# getline or system. (Anyway, configure scripts aren't supposed to use awk.)
+# Can't use only one -e and commands {dr foo} because foo has to be last.
+# Be careful, because the filename may contain /.
+# Be careful with whitespace; we need to use echo.
+kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
+if test x"$kpse_file_substs" = x; then
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`luatexdir/Makefile.in'
+               without any \`kpse_include' directives" >&5
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`luatexdir/Makefile.in'
+               without any \`kpse_include' directives" >&2;}
+fi
+# Create the sed command line ...
+# Input lines containing "@configure_input@" are output twice,
+# first with our modifications and then unmodified.
+kpse_substs="sed -e '/@configure_input@/ { h; \
+  s,@configure_input@,luatexdir/Makefile.aux.  Generated from `echo luatexdir/Makefile.in |
+  sed 's,.*/,,'` by configure.,; G; }'"
+for kpse_inc in $kpse_file_substs; do
+  kpse_read=`case $kpse_inc in
+    [\\/$]*) # Absolute
+      if test -f "$kpse_inc"; then
+        echo "$kpse_inc"
+      fi;;
+    *) # Relative
+      if test -f "$kpse_inc"; then
+        # Build tree
+        echo "$kpse_inc"
+      elif test -f "$srcdir/$kpse_inc"; then
+        # Source tree
+        echo "$srcdir/$kpse_inc"
+      fi;;
+  esac`
+  if test -n "$kpse_read"; then
+    kpse_mung=`echo $kpse_inc | sed 's,/,%,g'`
+    kpse_substs="$kpse_substs -e '/^kpse_include $kpse_mung$/r $kpse_read'"
+  fi
+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
+ ;;
     "Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case Makefile.in in
   [\\/$]*) # Absolute
-    test -f "Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: Makefile.in" >&5
-echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
+    test -f "Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "Makefile.in";;
   *) # Relative
@@ -12089,8 +12635,8 @@ echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
       echo "$srcdir/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: Makefile.in" >&5
-echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12107,9 +12653,9 @@ echo "$as_me: error: cannot find input file: Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12146,8 +12692,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "doc/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case doc/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "doc/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: doc/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: doc/Makefile.in" >&2;}
+    test -f "doc/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: doc/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: doc/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "doc/Makefile.in";;
   *) # Relative
@@ -12159,8 +12705,8 @@ echo "$as_me: error: cannot find input file: doc/Makefile.in" >&2;}
       echo "$srcdir/doc/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: doc/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: doc/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: doc/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: doc/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12177,9 +12723,9 @@ echo "$as_me: error: cannot find input file: doc/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`doc/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`doc/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`doc/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`doc/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12216,8 +12762,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "lib/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case lib/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "lib/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: lib/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: lib/Makefile.in" >&2;}
+    test -f "lib/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: lib/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: lib/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "lib/Makefile.in";;
   *) # Relative
@@ -12229,8 +12775,8 @@ echo "$as_me: error: cannot find input file: lib/Makefile.in" >&2;}
       echo "$srcdir/lib/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: lib/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: lib/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: lib/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: lib/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12247,9 +12793,9 @@ echo "$as_me: error: cannot find input file: lib/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`lib/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`lib/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`lib/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`lib/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12286,8 +12832,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "man/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case man/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "man/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: man/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: man/Makefile.in" >&2;}
+    test -f "man/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: man/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: man/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "man/Makefile.in";;
   *) # Relative
@@ -12299,8 +12845,8 @@ echo "$as_me: error: cannot find input file: man/Makefile.in" >&2;}
       echo "$srcdir/man/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: man/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: man/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: man/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: man/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12317,9 +12863,9 @@ echo "$as_me: error: cannot find input file: man/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`man/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`man/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`man/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`man/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12356,8 +12902,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "mpware/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case mpware/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "mpware/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: mpware/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: mpware/Makefile.in" >&2;}
+    test -f "mpware/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: mpware/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: mpware/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "mpware/Makefile.in";;
   *) # Relative
@@ -12369,8 +12915,8 @@ echo "$as_me: error: cannot find input file: mpware/Makefile.in" >&2;}
       echo "$srcdir/mpware/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: mpware/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: mpware/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: mpware/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: mpware/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12387,9 +12933,9 @@ echo "$as_me: error: cannot find input file: mpware/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`mpware/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`mpware/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`mpware/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`mpware/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12426,8 +12972,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "mpdir/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case mpdir/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "mpdir/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: mpdir/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: mpdir/Makefile.in" >&2;}
+    test -f "mpdir/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: mpdir/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: mpdir/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "mpdir/Makefile.in";;
   *) # Relative
@@ -12439,8 +12985,8 @@ echo "$as_me: error: cannot find input file: mpdir/Makefile.in" >&2;}
       echo "$srcdir/mpdir/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: mpdir/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: mpdir/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: mpdir/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: mpdir/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12457,9 +13003,9 @@ echo "$as_me: error: cannot find input file: mpdir/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`mpdir/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`mpdir/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`mpdir/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`mpdir/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12496,8 +13042,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "web2c/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case web2c/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "web2c/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: web2c/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: web2c/Makefile.in" >&2;}
+    test -f "web2c/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: web2c/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: web2c/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "web2c/Makefile.in";;
   *) # Relative
@@ -12509,8 +13055,8 @@ echo "$as_me: error: cannot find input file: web2c/Makefile.in" >&2;}
       echo "$srcdir/web2c/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: web2c/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: web2c/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: web2c/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: web2c/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12527,9 +13073,9 @@ echo "$as_me: error: cannot find input file: web2c/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`web2c/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`web2c/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`web2c/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`web2c/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12566,8 +13112,8 @@ kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
     "window/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case window/Makefile.in in
   [\\/$]*) # Absolute
-    test -f "window/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: window/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: window/Makefile.in" >&2;}
+    test -f "window/Makefile.in" || { { $as_echo "$as_me:$LINENO: error: cannot find input file: window/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: window/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     echo "window/Makefile.in";;
   *) # Relative
@@ -12579,8 +13125,8 @@ echo "$as_me: error: cannot find input file: window/Makefile.in" >&2;}
       echo "$srcdir/window/Makefile.in"
     else
       # /dev/null tree
-      { { echo "$as_me:$LINENO: error: cannot find input file: window/Makefile.in" >&5
-echo "$as_me: error: cannot find input file: window/Makefile.in" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: cannot find input file: window/Makefile.in" >&5
+$as_echo "$as_me: error: cannot find input file: window/Makefile.in" >&2;}
    { (exit 1); exit 1; }; }
     fi;;
   esac` || { (exit 1); exit 1; }
@@ -12597,9 +13143,9 @@ echo "$as_me: error: cannot find input file: window/Makefile.in" >&2;}
 # Be careful with whitespace; we need to use echo.
 kpse_file_substs=`sed -n '/^kpse_include/s%[ 	]*\(.*\)%\1%p' "$kpse_input"`
 if test x"$kpse_file_substs" = x; then
-  { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`window/Makefile.in'
+  { $as_echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`window/Makefile.in'
                without any \`kpse_include' directives" >&5
-echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`window/Makefile.in'
+$as_echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`window/Makefile.in'
                without any \`kpse_include' directives" >&2;}
 fi
 # Create the sed command line ...
@@ -12643,6 +13189,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -12664,4 +13215,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $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;}
+fi
 
diff --git a/Build/source/texk/web2c/configure.in b/Build/source/texk/web2c/configure.in
index d91600af948..15515751596 100644
--- a/Build/source/texk/web2c/configure.in
+++ b/Build/source/texk/web2c/configure.in
@@ -169,6 +169,18 @@ else
   with_pdfetex=no
 fi
 
+# For luaTeX.
+if test -d $srcdir/luatexdir; then
+  # Create build dir, if necessary.
+  test -d luatexdir || mkdir luatexdir
+  test "${with_luatex+set}" = set || with_luatex=yes
+else
+  if test "x$with_luatex" = xyes; then
+    AC_MSG_WARN(The luaTeX sources are not available.)
+  fi
+  with_luatex=no
+fi
+
 # For XeTeX
 if test -d $srcdir/xetexdir \
     && test -d $srcdir/etexdir; then
@@ -182,6 +194,7 @@ fi
 
 # Check whether C++ compiler works.  Prevent exit if it doesn't.
 if test "x$with_pdftex"  = xyes ||
+   test "x$with_luatex"  = xyes ||
    test "x$with_pdfetex" = xyes ||
    test "x$with_xetex"   = xyes
 then
@@ -196,10 +209,13 @@ then
     && AC_MSG_WARN(No C++ compiler: pdfTeX will not be compiled.)
   test "x$with_pdfetex" = xyes \
     && AC_MSG_WARN(No C++ compiler: pdfeTeX will not be compiled.)
+  test "x$with_luatex" = xyes \
+    && AC_MSG_WARN(No C++ compiler: luaTeX will not be compiled.)
   test "x$with_xetex" = xyes \
     && AC_MSG_WARN(No C++ compiler: XeTeX will not be compiled.)
   with_pdftex=no
   with_pdfetex=no
+  with_luatex=no
   with_xetex=no
   true
 }
@@ -217,6 +233,7 @@ CXXHACKLINK='$(kpathsea_cxx_link)'
 CXXHACKLDLIBS='$(LOADLIBES)'
 if test "x$with_cxx_runtime_hack" = xyes &&
    { test "x$with_pdftex"  = xyes ||
+     test "x$with_luatex"  = xyes ||
      test "x$with_pdfetex" = xyes ||
      test "x$with_xetex"   = xyes; }
 then
@@ -282,6 +299,13 @@ else
 fi
 AC_SUBST(PETEX)
 
+if test "x$with_luatex" = xyes; then
+  LTEX=
+else
+  LTEX='#! '
+fi
+AC_SUBST(LTEX)
+
 if test "x$with_xetex" = xyes; then
   XETEX=
 else
@@ -400,6 +424,11 @@ then
   KPSE_CONFIG_FILES([pdftexdir/Makefile])
 fi
 
+# Ditto luatex.
+if test "$with_luatex" = yes; then
+  KPSE_CONFIG_FILES([luatexdir/Makefile])
+fi
+
 dnl Create tests subdirectory.
 test -d tests || mkdir tests
 
diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h
index ad461ddad63..21bbdcbbea8 100644
--- a/Build/source/texk/web2c/help.h
+++ b/Build/source/texk/web2c/help.h
@@ -10,7 +10,9 @@
    thing, the messages have a lot in common, so it's nice to have them
    in one place.)
 
-Copyright (C) 1995, 96 Karl Berry, 2001, 03, 04 Olaf Weber.
+Copyright 1995, 1996 Karl Berry.
+Copyright 2001, 2003, 2004 Olaf Weber.
+Copyright 2008 Taco Hoekwater.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -23,10 +25,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
-/* Note: Help messages for TeX & MF family moved to texmfmp-help.h, to
+/* Help messages for TeX & MF family are in texmfmp-help.h, to
    prevent multiple-definition errors. */
 
 #ifndef HELP_H
@@ -263,6 +264,20 @@ const_string OTANGLEHELP[] = {
 };
 #endif /* OTANGLE */
 
+#if defined (LUATANGLE) || defined (LUATANGLEBOOT)
+const_string LUATANGLEHELP[] = {
+    "Usage: luatangle [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
+    "  Tangle WEBFILE with CHANGEFILE into a Pascal program.",
+    "  Default CHANGEFILE is /dev/null;",
+    "  Pascal output goes to the basename of WEBFILE extended with `.p',",
+    "  and a string pool file, if necessary, to the same extended with `.pool'.",
+    "",
+    "-help       display this help and exit",
+    "-version    output version information and exit",
+    NULL
+};
+#endif /* LUATANGLE */
+
 #ifdef OVF2OVP
 const_string OVF2OVPHELP[] = {
     "Usage: ovf2ovp [OPTION]... OVFNAME[.ovf] [OFMNAME[.ofm] [OVPFILE[.ovp]]]",
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 2dd6b09805c..c7fc308855b 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -46,6 +46,8 @@
 #elif defined (pdfTeX)
 #include <pdftexdir/pdftexextra.h>
 #include <pdftexdir/ptexlib.h>
+#elif defined (luaTeX)
+#include <luatexdir/luatexextra.h>
 #elif defined (Omega)
 #include <omegadir/omegaextra.h>
 #elif defined (eOmega)
@@ -109,6 +111,13 @@
 #include "xetexdir/XeTeX_ext.h"
 #endif
 
+#if defined(luaTeX)
+extern void lua_initialize(int ac, char **av);
+int etexp;
+#define MAYBE_STATIC  /* symbols needed in luainit.c */
+#else
+#define MAYBE_STATIC static
+#endif
 
 /* What we were invoked as and with.  */
 char **argv;
@@ -118,10 +127,10 @@ int argc;
 static const_string user_progname;
 
 /* The C version of what might wind up in DUMP_VAR.  */
-static const_string dump_name;
+MAYBE_STATIC const_string dump_name;
 
 /* The C version of the jobname, if given. */
-static const_string job_name;
+MAYBE_STATIC const_string c_job_name;
 
 /* Full source file name. */
 extern string fullnameoffile;
@@ -131,10 +140,10 @@ string translate_filename;
 string default_translate_filename;
 
 /* Needed for --src-specials option. */
-static char *last_source_name;
+MAYBE_STATIC char *last_source_name;
 static int last_lineno;
-static boolean srcspecialsoption = false;
-static void parse_src_specials_option P1H(const_string);
+MAYBE_STATIC boolean srcspecialsoption = false;
+MAYBE_STATIC void parse_src_specials_option P1H(const_string);
 
 /* The main body of the WEB is transformed into this procedure.  */
 extern TEXDLL void mainbody P1H(void);
@@ -155,7 +164,7 @@ static string get_input_file_name P1H(void);
 static int eightbitp;
 #endif /* Omega || eOmega || Aleph */
 
-#if defined(pdfTeX) || defined(pdfeTeX)
+#if defined(pdfTeX) || defined(pdfeTeX) || defined(luaTeX)
 char *ptexbanner;
 #endif
 
@@ -172,6 +181,30 @@ texmf_yesno(const_string var)
   return value && (*value == 't' || *value == 'y' || *value == '1');
 }
 
+#ifdef luaTeX
+#define TEXformatdefault TEX_format_default
+#define debugformatfile debug_format_file
+#define formatdefaultlength format_default_length
+#define iniversion ini_version
+#define outputfilename output_file_name
+#define readyalready ready_already
+#define dumpoption dump_option
+#define outputcomment output_comment
+#define pdfoutputoption pdf_output_option
+#define pdfoutputvalue pdf_output_value
+#define pdfdraftmodeoption pdf_draftmode_option
+#define pdfdraftmodevalue pdf_draftmode_value
+#define dumpline dump_line
+#define bufsize buf_size
+#define maxbufstack max_buf_stack
+#define inopen in_open
+#define inputfile input_file
+#define strstart str_start
+#define strpool str_pool
+#define poolptr pool_ptr
+#define poolsize pool_size
+#endif
+
 /* The entry point: set up for reading the command line, which will
    happen in `topenin', then call the main body.  */
 
@@ -196,7 +229,7 @@ maininit P2C(int, ac, string *, av)
   synctexoption = 0;
 #endif
 
-#if defined(pdfTeX)
+#if defined(pdfTeX) || defined(luaTeX)
   ptexbanner = BANNER;
 #endif
 
@@ -259,10 +292,10 @@ maininit P2C(int, ac, string *, av)
       iniversion = true;
     } else if (FILESTRCASEEQ (kpse_program_name, "virtex")) {
       virversion = true;
-#if !defined(Omega) && !defined(eOmega) && !defined(Aleph)
+#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(luaTeX)
     } else if (FILESTRCASEEQ (kpse_program_name, "mltex")) {
       mltexp = true;
-#endif /* !Omega && !eOmega && !Aleph */
+#endif /* !Omega && !eOmega && !Aleph && !luaTeX */
 #endif /* TeX */
     }
 
@@ -276,7 +309,7 @@ maininit P2C(int, ac, string *, av)
 #ifdef TeX
   /* Sanity check: -mltex, -enc, -etex only work in combination with -ini. */
   if (!iniversion) {
-#if !defined(Omega) && !defined(eOmega) && !defined(Aleph)
+#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(luaTeX)
     if (mltexp) {
       fprintf(stderr, "-mltex only works with -ini\n");
     }
@@ -355,6 +388,7 @@ maininit P2C(int, ac, string *, av)
 #endif /* TeX */
 }
 
+#if !defined(WIN32) || defined(__MINGW32__)
 /* The entry point: set up for reading the command line, which will
    happen in `topenin', then call the main body.  */
 
@@ -370,12 +404,17 @@ main P2C(int, ac,  string *, av)
   _setmaxstdio(2048);
 #endif
 
-  maininit(ac, av);
+#if defined(luaTeX)
+  lua_initialize (ac, av);
+#else
+  maininit (ac, av);
+#endif
 
   /* Call the real main program.  */
   mainbody ();
   return EXIT_SUCCESS;
 } 
+#endif /* !(WIN32 || __MINGW32__) */
 
 /* This is supposed to ``open the terminal for input'', but what we
    really do is copy command line arguments into TeX's or Metafont's
@@ -450,7 +489,7 @@ topenin P1H(void)
 
   /* One more time, this time converting to TeX's internal character
      representation.  */
-#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(XeTeX)
+#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(XeTeX) && !defined(luaTeX)
   for (i = first; i < last; i++)
     buffer[i] = xord[buffer[i]];
 #endif
@@ -652,7 +691,7 @@ ipcpage P1C(int, is_eof)
 
 #if defined (TeX) || defined (MF) || defined (MP)
   /* TCX and Omega get along like sparks and gunpowder. */
-#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(XeTeX)
+#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(XeTeX) && !defined(luaTeX) 
 
 /* Return the next number following START, setting POST to the following
    character, as in strtol.  Issue a warning and return -1 if no number
@@ -892,17 +931,17 @@ static struct option long_options[]
       { "ipc",                       0, &ipcon, 1 },
       { "ipc-start",                 0, &ipcon, 2 },
 #endif /* IPC */
-#if !defined(Omega) && !defined(eOmega) && !defined(Aleph)
+#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(luaTeX)
       { "mltex",                     0, &mltexp, 1 },
 #if !defined(XeTeX)
       { "enc",                       0, &enctexp, 1 },
 #endif /* !XeTeX */
 #endif /* !Omega && !eOmega && !Aleph */
-#if defined (eTeX) || defined(pdfTeX) || defined(Aleph) || defined(XeTeX)
+#if defined (eTeX) || defined(pdfTeX) || defined(Aleph) || defined(XeTeX) || defined(luaTeX)
       { "etex",                      0, &etexp, 1 },
 #endif /* eTeX || pdfTeX || Aleph */
       { "output-comment",            1, 0, 0 },
-#if defined(pdfTeX)
+#if defined(pdfTeX) || defined(luaTeX)
       { "draftmode",                 0, 0, 0 },
       { "output-format",             1, 0, 0 },
 #endif /* pdfTeX */
@@ -927,7 +966,11 @@ static struct option long_options[]
       { "no-parse-first-line",       0, &parsefirstlinep, -1 },
       { "translate-file",            1, 0, 0 },
       { "default-translate-file",    1, 0, 0 },
+#if !defined(luaTeX)
       { "8bit",                      0, &eightbitp, 1 },
+#else
+      { "8bit",                      0, 0, 0 },
+#endif
 #if defined(XeTeX)
       { "no-pdf",                 0, &nopdfoutput, 1 },
       { "output-driver",          1, 0, 0 },
@@ -982,11 +1025,11 @@ parse_options P2C(int, argc,  string *, argv)
 
     } else if (ARGUMENT_IS ("jobname")) {
 #ifdef XeTeX
-      job_name = optarg;
+      c_job_name = optarg;
 #else
-      job_name = normalize_quotes(optarg, "jobname");
+      c_job_name = normalize_quotes (optarg, "jobname");
 #endif
-      
+
     } else if (ARGUMENT_IS (DUMP_OPTION)) {
       dump_name = optarg;
       dumpoption = true;
@@ -1040,7 +1083,7 @@ parse_options P2C(int, argc,  string *, argv)
           parse_src_specials_option(optarg);
        }
 #endif /* TeX */
-#if defined(pdfTeX)
+#if defined(pdfTeX) || defined(luaTeX)
     } else if (ARGUMENT_IS ("output-format")) {
        pdfoutputoption = 1;
        if (strcmp(optarg, "dvi") == 0) {
@@ -1099,9 +1142,10 @@ parse_options P2C(int, argc,  string *, argv)
 		/* Synchronize TeXnology: catching the command line option as an unsigned long  */
 		synctexoption = (int) strtoul(optarg, NULL, 0);
  #endif
+
     } else if (ARGUMENT_IS ("version")) {
         char *versions;
-#if defined (pdfTeX) || defined(XeTeX)
+#if defined (pdfTeX) || defined(XeTeX) || defined(luaTeX)
         initversionstring(&versions); 
 #else
         versions = NULL;
@@ -1360,7 +1404,7 @@ boolean openoutnameok P1C(const_string, fname)
    closed using pclose().
 */
 
-#if defined(pdfTeX) || defined(pdfeTeX)
+#if defined(pdfTeX) || defined(pdfeTeX) || defined(luaTeX)
 
 static FILE *pipes [] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
                          NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
@@ -1509,8 +1553,8 @@ void
 get_date_and_time P4C(integer *, minutes,  integer *, day,
                       integer *, month,  integer *, year)
 {
-  time_t clock = time ((time_t *) 0);
-  struct tm *tmptr = localtime (&clock);
+  time_t myclock = time ((time_t *) 0);
+  struct tm *tmptr = localtime (&myclock);
 
   *minutes = tmptr->tm_hour * 60 + tmptr->tm_min;
   *day = tmptr->tm_mday;
@@ -1565,8 +1609,8 @@ get_seconds_and_micros P2C(integer *, seconds,  integer *, micros)
   *seconds = tb.time;
   *micros  = tb.millitm*1000;
 #else
-  time_t clock = time((time_t*)NULL);
-  *seconds = clock;
+  time_t myclock = time((time_t*)NULL);
+  *seconds = myclock;
   *micros  = 0;
 #endif
 }
@@ -1586,8 +1630,8 @@ getrandomseed()
   ftime(&tb);
   return (tb.millitm + 1000 * tb.time);
 #else
-  time_t clock = time ((time_t*)NULL);
-  struct tm *tmptr = localtime(&clock);
+  time_t myclock = time ((time_t*)NULL);
+  struct tm *tmptr = localtime(&myclock);
   return (tmptr->tm_sec + 60*(tmptr->tm_min + 60*tmptr->tm_hour));
 #endif
 }
@@ -1636,7 +1680,7 @@ input_line P1C(FILE *, f)
     --last;
 
   /* Don't bother using xord if we don't need to.  */
-#if !defined(Omega) && !defined(eOmega) && !defined(Aleph)
+#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(luaTeX)
   for (i = first; i <= last; i++)
      buffer[i] = xord[buffer[i]];
 #endif
@@ -1873,7 +1917,7 @@ do_undump P4C(char *, p,  int, item_size,  int, nitems,  FILE *, in_file)
 #ifdef XeTeX
   if (gzread (in_file, p, item_size * nitems) != item_size * nitems)
 #else
-  if (fread (p, item_size, nitems, in_file) != nitems)
+  if (fread (p, item_size, nitems, in_file) != (size_t) nitems)
 #endif
     FATAL2 ("Could not undump %d %d-byte item(s)", nitems, item_size);
 
@@ -1909,7 +1953,7 @@ setupboundvariable P3C(integer *, var,  const_string, var_name,  integer, dflt)
 
 /* FIXME -- some (most?) of this can/should be moved to the Pascal/WEB side. */
 #if defined(TeX) || defined(MP) || defined(MF)
-#if !defined(pdfTeX)
+#if !defined(pdfTeX) && !defined(luaTeX)
 static void
 checkpoolpointer (poolpointer poolptr, size_t len)
 {
@@ -1978,8 +2022,8 @@ strnumber
 getjobname(strnumber name)
 {
     strnumber ret = name;
-    if (job_name != NULL)
-      ret = maketexstring(job_name);
+    if (c_job_name != NULL)
+      ret = maketexstring(c_job_name);
     return ret;
 }
 #endif
@@ -2107,7 +2151,7 @@ makesrcspecial P2C(strnumber, srcfilename,
    */
   sprintf (buf, "src:%d ", lineno);
 
-  if (poolptr + strlen(buf) + strlen(filename) >= poolsize) {
+  if (poolptr + strlen(buf) + strlen(filename) >= (size_t)poolsize) {
        fprintf (stderr, "\nstring pool overflow\n"); /* fixme */
        exit (1);
   }
@@ -2178,7 +2222,7 @@ callmakempx P2C(string, mpname,  string, mpxname)
 #if defined (__sun__) || defined (__cplusplus)
 #define NO_MF_ASM
 #endif
-#if defined(WIN32) && !defined(NO_MF_ASM)
+#if defined(WIN32) && !defined(NO_MF_ASM) && !defined(__MINGW32__)
 #include "lib/mfmpw32.c"
 #elif defined (__i386__) && defined (__GNUC__) && !defined (NO_MF_ASM)
 #include "lib/mfmpi386.asm"
diff --git a/Build/source/texk/web2c/libsluapdf.mk b/Build/source/texk/web2c/libsluapdf.mk
new file mode 100644
index 00000000000..98396548acb
--- /dev/null
+++ b/Build/source/texk/web2c/libsluapdf.mk
@@ -0,0 +1,59 @@
+# $Id$
+# Libraries common to luatex and pdftex.
+# Public domain.
+
+# libz
+ZLIBDIR=../../libs/zlib
+ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
+ZLIBDEP = @ZLIBDEP@
+LDZLIB = @LDZLIB@
+
+$(ZLIBDIR)/libz.a: $(ZLIBSRCDIR)
+	cd $(ZLIBDIR) && $(MAKE) $(common_makeargs) libz.a
+
+# libpng
+LIBPNGDIR=../../libs/libpng
+LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
+LIBPNGDEP = @LIBPNGDEP@
+LDLIBPNG = @LDLIBPNG@
+
+$(LIBPNGDIR)/libpng.a: $(LIBPNGSRCDIR)/*.c
+	cd $(LIBPNGDIR) && $(MAKE) $(common_makeargs) libpng.a
+
+# libxpdf
+LIBXPDFDIR=../../libs/xpdf
+LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
+LIBXPDFDEP = @LIBXPDFDEP@
+LDLIBXPDF = @LDLIBXPDF@
+
+$(LIBXPDFDIR)/fofi/libfofi.a: $(LIBXPDFSRCDIR)/fofi/*.cc \
+	$(LIBXPDFSRCDIR)/fofi/*.h
+	cd $(LIBXPDFDIR)/fofi; $(MAKE) $(common_makeargs) libfofi.a
+$(LIBXPDFDIR)/goo/libGoo.a: $(LIBXPDFSRCDIR)/goo/*.cc \
+	$(LIBXPDFSRCDIR)/goo/*.c $(LIBXPDFSRCDIR)/goo/*.h
+	cd $(LIBXPDFDIR)/goo; $(MAKE) $(common_makeargs) libGoo.a
+$(LIBXPDFDIR)/xpdf/libxpdf.a: $(LIBXPDFSRCDIR)/xpdf/*.cc \
+	$(LIBXPDFSRCDIR)/xpdf/*.h
+	cd $(LIBXPDFDIR)/xpdf; $(MAKE) $(common_makeargs) libxpdf.a
+
+# md5
+LIBMD5DIR=../../libs/md5
+LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR)
+LIBMD5DEP=$(LIBMD5DIR)/md5.o
+
+$(LIBMD5DEP): $(LIBMD5SRCDIR)/md5.c $(LIBMD5SRCDIR)/md5.h
+clean:: md5lib-clean
+md5lib-clean:
+	rm -f $(LIBMD5DEP)
+
+# obsdcompat
+LIBOBSDDIR=../../libs/obsdcompat
+LIBOBSDSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
+LIBOBSDDEP=@LIBOBSDDEP@
+LDLIBOBSD=@LDLIBOBSD@
+
+$(LIBOBSDDIR)/libopenbsd-compat.a: $(LIBOBSDSRCDIR)/*.c $(LIBOBSDSRCDIR)/*.h
+# common_makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(XMAKEARGS)
+# CFLAGS setzt libopenbsd-compat selbst, nicht durchreichen!
+	cd $(LIBOBSDDIR); $(MAKE) $(MFLAGS) $(XMAKEARGS) libopenbsd-compat.a
+
diff --git a/Build/source/texk/web2c/luatexdir/Makefile.in b/Build/source/texk/web2c/luatexdir/Makefile.in
index a959a42d56b..5f30dd24842 100644
--- a/Build/source/texk/web2c/luatexdir/Makefile.in
+++ b/Build/source/texk/web2c/luatexdir/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile for libpdf - te@dbs.uni-hannover.de
+# Makefile for luatex.
 # $Id$
 
 kpse_include ../make/common.mk
diff --git a/Build/source/texk/web2c/luatexdir/depend.mk b/Build/source/texk/web2c/luatexdir/depend.mk
index 8d1bf394648..e33bb484923 100644
--- a/Build/source/texk/web2c/luatexdir/depend.mk
+++ b/Build/source/texk/web2c/luatexdir/depend.mk
@@ -1,2874 +1,10 @@
-avl.o: ../../../../src/texk/web2c/luatexdir/avl.c \
-  ../../../../src/texk/web2c/luatexdir/avl.h
-avlstuff.o: ../../../../src/texk/web2c/luatexdir/avlstuff.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
+lua/mp.o: lua/mp.c mplib.h mpmp.h mppsout.h
+lua/psout.o: lua/psout.c ../../../../texk/web2c/luatexdir/avl.h mplib.h \
+  mpmp.h mppsout.h
+lua/lmplib.o: ../../../../texk/web2c/luatexdir/lua/lmplib.c \
   \
   \
   \
   \
   \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-font/mapfile.o: ../../../../src/texk/web2c/luatexdir/font/mapfile.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
- 
-font/pkin.o: ../../../../src/texk/web2c/luatexdir/font/pkin.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-font/subfont.o: ../../../../src/texk/web2c/luatexdir/font/subfont.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-font/tounicode.o: ../../../../src/texk/web2c/luatexdir/font/tounicode.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-font/vfpacket.o: ../../../../src/texk/web2c/luatexdir/font/vfpacket.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-font/writeenc.o: ../../../../src/texk/web2c/luatexdir/font/writeenc.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-font/writefont.o: ../../../../src/texk/web2c/luatexdir/font/writefont.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-font/writet1.o: ../../../../src/texk/web2c/luatexdir/font/writet1.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
- 
-font/writet3.o: ../../../../src/texk/web2c/luatexdir/font/writet3.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-glyph.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/magstep.h
-font/writettf.o: ../../../../src/texk/web2c/luatexdir/font/writettf.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/font/writettf.h \
-  ../../../../src/texk/web2c/luatexdir/font/macnames.c
-font/writetype0.o:  \
- ../../../../src/texk/web2c/luatexdir/font/writetype0.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/font/writettf.h \
-  ../../../../src/texk/web2c/luatexdir/font/writecff.h
-font/writetype2.o:  \
- ../../../../src/texk/web2c/luatexdir/font/writetype2.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/font/writettf.h \
-  ../../../../src/texk/web2c/luatexdir/font/writecff.h \
-  ../../../../src/texk/web2c/luatexdir/font/sfnt.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/font/tt_glyf.h
-font/writecff.o: ../../../../src/texk/web2c/luatexdir/font/writecff.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/font/writecff.h
-font/tt_glyf.o: ../../../../src/texk/web2c/luatexdir/font/tt_glyf.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/font/sfnt.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/font/tt_table.h \
-  ../../../../src/texk/web2c/luatexdir/font/tt_glyf.h
-font/tt_table.o: ../../../../src/texk/web2c/luatexdir/font/tt_table.c \
-  ../../../../src/texk/web2c/luatexdir/font/sfnt.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/font/tt_table.h
-font/sfnt.o: ../../../../src/texk/web2c/luatexdir/font/sfnt.c \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/font/sfnt.h
-font/texfont.o: ../../../../src/texk/web2c/luatexdir/font/texfont.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
- 
-font/tfmofm.o: ../../../../src/texk/web2c/luatexdir/font/tfmofm.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
- 
-font/vfovf.o: ../../../../src/texk/web2c/luatexdir/font/vfovf.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
- 
-font/luafont.o: ../../../../src/texk/web2c/luatexdir/font/luafont.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-font/dofont.o: ../../../../src/texk/web2c/luatexdir/font/dofont.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
- 
-image/epdf.o: ../../../../src/texk/web2c/luatexdir/image/epdf.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-image/pdftoepdf.o:  \
- ../../../../src/texk/web2c/luatexdir/image/pdftoepdf.cc \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/image/epdf.h \
-  ../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../web2c/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../web2c/luatexdir/ptexmac.h \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
- 
-image/writeimg.o: ../../../../src/texk/web2c/luatexdir/image/writeimg.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
- 
-image/writejbig2.o:  \
- ../../../../src/texk/web2c/luatexdir/image/writejbig2.c \
-  ../../../../src/texk/web2c/luatexdir/image/writejbig2.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h
-image/writejpg.o: ../../../../src/texk/web2c/luatexdir/image/writejpg.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h
-image/writepng.o: ../../../../src/texk/web2c/luatexdir/image/writepng.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h
-lua/loslibext.o: ../../../../src/texk/web2c/luatexdir/lua/loslibext.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/lcallbacklib.o:  \
- ../../../../src/texk/web2c/luatexdir/lua/lcallbacklib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/lkpselib.o: ../../../../src/texk/web2c/luatexdir/lua/lkpselib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/expand.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-glyph.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/readable.h
-lua/llualib.o: ../../../../src/texk/web2c/luatexdir/lua/llualib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/lnodelib.o: ../../../../src/texk/web2c/luatexdir/lua/lnodelib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/lpdflib.o: ../../../../src/texk/web2c/luatexdir/lua/lpdflib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/lstatslib.o: ../../../../src/texk/web2c/luatexdir/lua/lstatslib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/ltexiolib.o: ../../../../src/texk/web2c/luatexdir/lua/ltexiolib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/ltexlib.o: ../../../../src/texk/web2c/luatexdir/lua/ltexlib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/ltokenlib.o: ../../../../src/texk/web2c/luatexdir/lua/ltokenlib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/lfontlib.o: ../../../../src/texk/web2c/luatexdir/lua/lfontlib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/texluac.o: ../../../../src/texk/web2c/luatexdir/lua/texluac.c \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
- 
-lua/luainit.o: ../../../../src/texk/web2c/luatexdir/lua/luainit.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h ../luatexdir/luatexextra.h
-lua/luastuff.o: ../../../../src/texk/web2c/luatexdir/lua/luastuff.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/luatex.o: ../../../../src/texk/web2c/luatexdir/lua/luatex.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
- 
-lua/luatoken.o: ../../../../src/texk/web2c/luatexdir/lua/luatoken.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/tokens.h
-lua/luanode.o: ../../../../src/texk/web2c/luatexdir/lua/luanode.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/llanglib.o: ../../../../src/texk/web2c/luatexdir/lua/llanglib.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lua/limglib.o: ../../../../src/texk/web2c/luatexdir/lua/limglib.c \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/lua/../image/image.h
-lang/hnjalloc.o: ../../../../src/texk/web2c/luatexdir/lang/hnjalloc.c
-lang/hyphen.o: ../../../../src/texk/web2c/luatexdir/lang/hyphen.c \
-  ../../../../src/texk/web2c/luatexdir/lang/hnjalloc.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-lang/texlang.o: ../../../../src/texk/web2c/luatexdir/lang/texlang.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h
-tex/linebreak.o: ../../../../src/texk/web2c/luatexdir/tex/linebreak.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-tex/postlinebreak.o:  \
- ../../../../src/texk/web2c/luatexdir/tex/postlinebreak.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-tex/texnodes.o: ../../../../src/texk/web2c/luatexdir/tex/texnodes.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-tex/textoken.o: ../../../../src/texk/web2c/luatexdir/tex/textoken.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/tokens.h
-tex/texpdf.o: ../../../../src/texk/web2c/luatexdir/tex/texpdf.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h
-managed-sa.o: ../../../../src/texk/web2c/luatexdir/managed-sa.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/managed-sa.h
-mathcodes.o: ../../../../src/texk/web2c/luatexdir/mathcodes.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/managed-sa.h
-textcodes.o: ../../../../src/texk/web2c/luatexdir/textcodes.c \
-  ../../../../src/texk/web2c/luatexdir/luatex-api.h \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/managed-sa.h
-utils.o: ../../../../src/texk/web2c/luatexdir/utils.c \
-  \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-stat.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
-  ../../../../src/texk/web2c/luatexdir/svnversion.h \
-  \
- 
-writezip.o: ../../../../src/texk/web2c/luatexdir/writezip.c \
-  ../../../../src/texk/web2c/luatexdir/ptexlib.h ../luatexd.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmp.h \
-  ../../../../src/texk/web2c/luatexdir/../cpascal.h \
-  ../../../../src/texk/web2c/luatexdir/../config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/config.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-std.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-unistd.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/systypes.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-memstr.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-errno.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-minmax.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-limits.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-proto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/debug.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/types.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/lib.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/progname.h \
-  ../../web2c/c-auto.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-fopen.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/getopt.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/proginit.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/tex-file.h \
-  ../../../../src/texk/web2c/luatexdir/../help.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-pathch.h \
-  ../../../../src/texk/web2c/luatexdir/../../kpathsea/c-ctype.h \
-  ../../../../src/texk/web2c/luatexdir/../texmfmem.h ../luatexcoerce.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/luatex.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/ptexlib.h \
-  ../../../../src/texk/web2c/luatexdir/ptexmac.h \
-  ../../../../src/texk/web2c/luatexdir/avlstuff.h \
-  ../../../../src/texk/web2c/luatexdir/avl.h \
-  ../../../../src/texk/web2c/luatexdir/image/image.h \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  \
-  ../../../../src/texk/web2c/luatexdir/font/texfont.h \
-  ../../../../src/texk/web2c/luatexdir/../luatexdir/managed-sa.h \
-  ../../../../src/texk/web2c/luatexdir/hyphen.h \
-  ../../../../src/texk/web2c/luatexdir/nodes.h \
- 
+  mplib.h mpmp.h mppsout.h
diff --git a/Build/source/texk/web2c/luatexdir/luatex.mk b/Build/source/texk/web2c/luatexdir/luatex.mk
index ed745cd261d..4bb69034369 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.mk
+++ b/Build/source/texk/web2c/luatexdir/luatex.mk
@@ -145,10 +145,10 @@ luatexbin:
 	$(MAKE) $(luatex_bin)
 
 luatex-cross:
-	$(MAKE) web2c-cross
+	$(MAKE) luatex-web2c-cross
 	$(MAKE) luatexbin
 
-web2c-cross: $(web2c_programs)
+luatex-web2c-cross: $(web2c_programs)
 	@if test ! -x $(linux_build_dir)/luatangle; then echo Error: linux_build_dir not ready; exit -1; fi
 	rm -f web2c/fixwrites web2c/splitup web2c/web2c
 	cp -f $(linux_build_dir)/web2c/fixwrites web2c
diff --git a/Build/source/texk/web2c/luatexdir/luatexlib.mk b/Build/source/texk/web2c/luatexdir/luatexlib.mk
index b1239b203ba..32e14e124cd 100644
--- a/Build/source/texk/web2c/luatexdir/luatexlib.mk
+++ b/Build/source/texk/web2c/luatexdir/luatexlib.mk
@@ -2,79 +2,18 @@
 # $Id$
 # Public domain.
 
-# The pdf*tex programs depend on a number of libraries.
-# Include dependencies to get the built if we don't do make
+# luatex depends on a number of libraries.
+# Include dependencies to get them built if we don't do make
 # from the top-level directory.
 
 Makefile: luatexdir/luatexlib.mk
 
-# libz
-
-ZLIBDIR=../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-ZLIBDEP = @ZLIBDEP@
-LDZLIB = @LDZLIB@
-
-$(ZLIBDIR)/libz.a: $(ZLIBSRCDIR)
-	cd $(ZLIBDIR) && $(MAKE) $(common_makeargs) libz.a
-
-# libpng
-
-LIBPNGDIR=../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
-
-$(LIBPNGDIR)/libpng.a: $(LIBPNGSRCDIR)/*.c
-	cd $(LIBPNGDIR) && $(MAKE) $(common_makeargs) libpng.a
-
-
-# libxpdf
-
-LIBXPDFDIR=../../libs/xpdf
-LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
-LIBXPDFDEP = @LIBXPDFDEP@
-LDLIBXPDF = @LDLIBXPDF@
-
-$(LIBXPDFDIR)/fofi/libfofi.a: $(LIBXPDFSRCDIR)/fofi/*.cc \
-	$(LIBXPDFSRCDIR)/fofi/*.h
-	cd $(LIBXPDFDIR)/fofi; $(MAKE) $(common_makeargs) libfofi.a
-$(LIBXPDFDIR)/goo/libGoo.a: $(LIBXPDFSRCDIR)/goo/*.cc \
-	$(LIBXPDFSRCDIR)/goo/*.c $(LIBXPDFSRCDIR)/goo/*.h
-	cd $(LIBXPDFDIR)/goo; $(MAKE) $(common_makeargs) libGoo.a
-$(LIBXPDFDIR)/xpdf/libxpdf.a: $(LIBXPDFSRCDIR)/xpdf/*.cc \
-	$(LIBXPDFSRCDIR)/xpdf/*.h
-	cd $(LIBXPDFDIR)/xpdf; $(MAKE) $(common_makeargs) libxpdf.a
-
-
-# md5
-
-LIBMD5DIR=../../libs/md5
-LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR)
-LIBMD5DEP=$(LIBMD5DIR)/md5.o
-
-$(LIBMD5DEP): $(LIBMD5SRCDIR)/md5.c $(LIBMD5SRCDIR)/md5.h
-clean:: md5lib-clean
-md5lib-clean:
-	rm -f $(LIBMD5DEP)
-
-# obsdcompat
-LIBOBSDDIR=../../libs/obsdcompat
-LIBOBSDSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
-LIBOBSDDEP=@LIBOBSDDEP@
-LDLIBOBSD=@LDLIBOBSD@
-
-$(LIBOBSDDIR)/libopenbsd-compat.a: $(LIBOBSDSRCDIR)/*.c $(LIBOBSDSRCDIR)/*.h
-# common_makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(XMAKEARGS)
-# CFLAGS setzt libopenbsd-compat selbst, nicht durchreichen!
-	cd $(LIBOBSDDIR); $(MAKE) $(MFLAGS) $(XMAKEARGS) libopenbsd-compat.a
-
 # libpdf itself
-pdflib = luatexdir/libpdf.a
-pdflib_sources = $(srcdir)/luatexdir/*.c $(srcdir)/luatexdir/*.cc \
+luapdflib = luatexdir/libpdf.a
+luapdflib_sources = $(srcdir)/luatexdir/*.c $(srcdir)/luatexdir/*.cc \
 	$(srcdir)/luatexdir/*.h
 
-luatexdir/libpdf.a: $(pdflib_sources) luatexdir/luatexextra.h ctangle
+$(luapdflib): $(luapdflib_sources) luatexdir/luatexextra.h ctangle
 	cd luatexdir && mkdir -p font image lua lang tex && $(MAKE) $(common_makeargs) libpdf.a
 
 # makecpool:
@@ -202,11 +141,11 @@ $(LUAZLIBDEP): $(LUAZLIBDIR)/lgzip.c $(LUAZLIBDIR)/lzlib.c
 
 # Convenience variables.
 
-luatexlibs = $(pdflib) $(LDLIBPNG) $(LDZLIB) $(LDLIBXPDF) $(LIBMD5DEP) $(LDLIBOBSD) \
+luatexlibs = $(luapdflib) $(LDLIBPNG) $(LDZLIB) $(LDLIBXPDF) $(LIBMD5DEP) $(LDLIBOBSD) \
              $(LIBLUADEP) $(SLNUNICODEDEP)  $(LUAZIPDEP) $(ZZIPLIBDEP) $(LUAFSDEP) \
              $(LUAPEGDEP) $(LUAMDVDEP)  $(LUAZLIBDEP) $(LUAFFDEP)
 
-luatexlibsdep = $(pdflib) $(LIBPNGDEP) $(ZLIBDEP) $(LIBXPDFDEP) $(LIBMD5DEP) $(LIBOBSDDEP) \
+luatexlibsdep = $(luapdflib) $(LIBPNGDEP) $(ZLIBDEP) $(LIBXPDFDEP) $(LIBMD5DEP) $(LIBOBSDDEP) \
                 $(LIBLUADEP) $(SLNUNICODEDEP) $(ZZIPLIBDEP) $(LUAZIPDEP)  $(LUAFSDEP) \
                 $(LUAPEGDEP) $(LUAMDVDEP)  $(LUAZLIBDEP) $(LUAFFDEP) $(makecpool)
 
diff --git a/Build/source/texk/web2c/metapost.mk b/Build/source/texk/web2c/metapost.mk
index 858a97256e2..5ee774a44e1 100644
--- a/Build/source/texk/web2c/metapost.mk
+++ b/Build/source/texk/web2c/metapost.mk
@@ -19,10 +19,10 @@ mpware_sources = mpware/dmp.c mpware/makempx.in mpware/mpto.c mpware/newer.c
 # mpost
 
 mp_c = mpini.c mp0.c mp1.c mp2.c
-mp_o = mpini.o mp0.o mp1.o mp2.o mpextra.o loadpool.o
+mp_o = mpini.o mp0.o mp1.o mp2.o mpextra.o mp-loadpool.o
 
-loadpool.c: mp.pool $(mpostdir)/makecpool
-	$(mpostdir)/makecpool mp.pool mpdir/mplib.h > loadpool.c
+mp-loadpool.c: mp.pool $(mpostdir)/makecpool
+	$(mpostdir)/makecpool mp.pool mpdir/mplib.h >$@
 # mpostlibsdep also includes makecpool
 mpost: $(mp_o) $(mpostlibsdep)
 	$(kpathsea_link) $(mp_o) $(mpostlibs) $(LOADLIBES)
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.mk b/Build/source/texk/web2c/pdftexdir/pdftex.mk
index bd855f9c76f..c649f7cfeef 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.mk
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.mk
@@ -170,10 +170,10 @@ pdftexbin:
 	$(MAKE) $(pdftex_bin)
 
 pdftex-cross:
-	$(MAKE) web2c-cross
+	$(MAKE) pdftex-web2c-cross
 	$(MAKE) pdftexbin
 
-web2c-cross: $(web2c_programs)
+pdftex-web2c-cross: $(web2c_programs)
 	@if test ! -x $(linux_build_dir)/tangle; then echo Error: linux_build_dir not ready; exit -1; fi
 	rm -f web2c/fixwrites web2c/splitup web2c/web2c
 	cp -f $(linux_build_dir)/web2c/fixwrites web2c
diff --git a/Build/source/texk/web2c/pdftexdir/pdftexlib.mk b/Build/source/texk/web2c/pdftexdir/pdftexlib.mk
index 6c0b25956b4..bd23bfdc563 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftexlib.mk
+++ b/Build/source/texk/web2c/pdftexdir/pdftexlib.mk
@@ -7,68 +7,6 @@
 
 Makefile: pdftexdir/pdftexlib.mk
 
-# libz
-
-ZLIBDIR=../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-ZLIBDEP = @ZLIBDEP@
-LDZLIB = @LDZLIB@
-
-$(ZLIBDIR)/libz.a: $(ZLIBSRCDIR)
-	cd $(ZLIBDIR) && $(MAKE) $(common_makeargs) libz.a
-
-
-# libpng
-
-LIBPNGDIR=../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
-
-$(LIBPNGDIR)/libpng.a: $(LIBPNGSRCDIR)/*.c
-	cd $(LIBPNGDIR) && $(MAKE) $(common_makeargs) libpng.a
-
-
-# libxpdf
-
-LIBXPDFDIR=../../libs/xpdf
-LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
-LIBXPDFDEP = @LIBXPDFDEP@
-LDLIBXPDF = @LDLIBXPDF@
-
-$(LIBXPDFDIR)/fofi/libfofi.a: $(LIBXPDFSRCDIR)/fofi/*.cc \
-	$(LIBXPDFSRCDIR)/fofi/*.h
-	cd $(LIBXPDFDIR)/fofi; $(MAKE) $(common_makeargs) libfofi.a
-$(LIBXPDFDIR)/goo/libGoo.a: $(LIBXPDFSRCDIR)/goo/*.cc \
-	$(LIBXPDFSRCDIR)/goo/*.c $(LIBXPDFSRCDIR)/goo/*.h
-	cd $(LIBXPDFDIR)/goo; $(MAKE) $(common_makeargs) libGoo.a
-$(LIBXPDFDIR)/xpdf/libxpdf.a: $(LIBXPDFSRCDIR)/xpdf/*.cc \
-	$(LIBXPDFSRCDIR)/xpdf/*.h
-	cd $(LIBXPDFDIR)/xpdf; $(MAKE) $(common_makeargs) libxpdf.a
-
-
-# md5
-
-LIBMD5DIR=../../libs/md5
-LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR)
-LIBMD5DEP=$(LIBMD5DIR)/md5.o
-
-$(LIBMD5DEP): $(LIBMD5SRCDIR)/md5.c $(LIBMD5SRCDIR)/md5.h
-clean:: md5lib-clean
-md5lib-clean:
-	rm -f $(LIBMD5DEP)
-
-# obsdcompat
-LIBOBSDDIR=../../libs/obsdcompat
-LIBOBSDSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
-LIBOBSDDEP=@LIBOBSDDEP@
-LDLIBOBSD=@LDLIBOBSD@
-
-$(LIBOBSDDIR)/libopenbsd-compat.a: $(LIBOBSDSRCDIR)/*.c $(LIBOBSDSRCDIR)/*.h
-# common_makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(XMAKEARGS)
-# CFLAGS setzt libopenbsd-compat selbst, nicht durchreichen!
-	cd $(LIBOBSDDIR); $(MAKE) $(MFLAGS) $(XMAKEARGS) libopenbsd-compat.a
-
 # libpdf itself
 pdflib = pdftexdir/libpdf.a
 pdflib_sources = $(srcdir)/pdftexdir/*.c $(srcdir)/pdftexdir/*.cc \
diff --git a/Build/source/texk/web2c/stamp-aclocal b/Build/source/texk/web2c/stamp-aclocal
index 1acca8904a3..dd74b4dd662 100644
--- a/Build/source/texk/web2c/stamp-aclocal
+++ b/Build/source/texk/web2c/stamp-aclocal
@@ -1 +1 @@
-Tue Mar  4 16:43:07 CET 2008
+Thu Apr 10 20:21:40 CEST 2008
diff --git a/Build/source/texk/web2c/stamp-auto.in b/Build/source/texk/web2c/stamp-auto.in
index 4872e3714f6..fa6692b81b2 100644
--- a/Build/source/texk/web2c/stamp-auto.in
+++ b/Build/source/texk/web2c/stamp-auto.in
@@ -1 +1 @@
-Tue Mar  4 16:54:02 CET 2008
+Thu Apr 10 20:21:42 CEST 2008
diff --git a/Build/source/texk/web2c/stamp-configure b/Build/source/texk/web2c/stamp-configure
index e940606b3bf..251ab923a5f 100644
--- a/Build/source/texk/web2c/stamp-configure
+++ b/Build/source/texk/web2c/stamp-configure
@@ -1 +1 @@
-Tue Mar  4 16:53:56 CET 2008
+Thu Apr 10 20:21:43 CEST 2008
diff --git a/Build/source/texk/web2c/texmfmem.h b/Build/source/texk/web2c/texmfmem.h
index 13697685121..8d227add06d 100644
--- a/Build/source/texk/web2c/texmfmem.h
+++ b/Build/source/texk/web2c/texmfmem.h
@@ -63,7 +63,7 @@
 */
 
 /* Omega is sufficiently different to separate the definition. */
-#if !defined(Omega) && !defined(eOmega) && !defined(Aleph)
+#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(luaTeX)
 
 typedef union
 {
@@ -255,4 +255,15 @@ typedef union
 
 #define gr gg.GLUE
 
-#endif /* Omega || eOmega || Aleph */
+#endif /* Omega || eOmega || Aleph || luaTeX */
+
+#if defined(luaTeX)
+#define memory_word memoryword
+#define two_halves twohalves
+#define four_quarters fourquarters
+
+#define strnumber str_number
+#define poolpointer pool_pointer
+#define packedASCIIcode packed_ASCII_code
+#define internalfontnumber internal_font_number
+#endif /* luaTeX */
diff --git a/Build/source/texk/web2c/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h
index 97d1fe0a614..4d4332937bb 100644
--- a/Build/source/texk/web2c/texmfmp-help.h
+++ b/Build/source/texk/web2c/texmfmp-help.h
@@ -74,6 +74,66 @@ const_string ALEPHHELP[] = {
 };
 #endif /* Aleph */
 
+#ifdef luaTeX
+const_string LUATEXHELP[] = {
+    "Usage: luatex [OPTION]... [TEXNAME[.tex]] [COMMANDS]",
+    "   or: luatex [OPTION]... \\FIRST-LINE",
+    "   or: luatex [OPTION]... &FMT ARGS",
+    "  Run luaTeX on TEXNAME, usually creating TEXNAME.pdf.",
+    "  Any remaining COMMANDS are processed as luaTeX input, after TEXNAME is read.",
+    "  If the first line of TEXNAME is %&FMT, and FMT is an existing .fmt file,",
+    "  use it.  Else use `NAME.fmt', where NAME is the program invocation name,",
+    "  most commonly `luatex'.",
+    "",
+    "  Alternatively, if the first non-option argument begins with a backslash,",
+    "  interpret all non-option arguments as a line of luaTeX input.",
+    "",
+    "  Alternatively, if the first non-option argument begins with a &, the",
+    "  next word is taken as the FMT to read, overriding all else.  Any",
+    "  remaining arguments are processed as above.",
+    "",
+    "  If no arguments or options are specified, prompt for input.",
+    "",
+    "-enc                    enable encTeX extensions such as \\mubyte",
+    "-etex                   enable e-TeX extensions",
+    "[-no]-file-line-error   disable/enable file:line:error style messages",
+    "-fmt=FMTNAME            use FMTNAME instead of program name or a %& line",
+    "-halt-on-error          stop processing at the first error",
+    "-ini                    be luainitex, for dumping formats; this is implicitly",
+    "                          true if the program name is `luainitex'",
+    "-interaction=STRING     set interaction mode (STRING=batchmode/nonstopmode/",
+    "                          scrollmode/errorstopmode)",
+#ifdef IPC
+    "-ipc                    send DVI output to a socket as well as the usual",
+    "                          output file",
+    "-ipc-start              as -ipc, and also start the server at the other end",
+#endif /* IPC */
+    "-jobname=STRING         set the job name to STRING",
+    "-kpathsea-debug=NUMBER  set path searching debugging flags according to",
+    "                          the bits of NUMBER",
+    "[-no]-mktex=FMT         disable/enable mktexFMT generation (FMT=tex/tfm)",
+    "-mltex                  enable MLTeX extensions such as \\charsubdef",
+    "-output-comment=STRING  use STRING for DVI file comment instead of date",
+    "                          (no effect for PDF)",
+    "-output-directory=DIR   use DIR as the directory to write files to",
+    "-output-format=FORMAT   use FORMAT for job output; FORMAT is `dvi' or `pdf'",
+    "[-no]-parse-first-line  disable/enable parsing of the first line of the",
+    "                          input file",
+    "-progname=STRING        set program (and fmt) name to STRING",
+    "-recorder               enable filename recorder",
+    "[-no]-shell-escape      disable/enable \\write18{SHELL COMMAND}",
+    "-src-specials           insert source specials into the DVI file",
+    "-src-specials=WHERE     insert source specials in certain places of",
+    "                          the DVI file. WHERE is a comma-separated value",
+    "                          list: cr display hbox math par parend vbox",
+    "-translate-file=TCXNAME use the TCX file TCXNAME",
+    "-8bit                   make all characters printable by default",
+    "-help                   display this help and exit",
+    "-version                output version information and exit",
+    NULL
+};
+#endif /* luaTeX */
+ 
 #ifdef eTeX
 const_string ETEXHELP[] = {
     "Usage: etex [OPTION]... [TEXNAME[.tex]] [COMMANDS]",
diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h
index edf01750e73..ef5f53ae149 100644
--- a/Build/source/texk/web2c/texmfmp.h
+++ b/Build/source/texk/web2c/texmfmp.h
@@ -45,6 +45,8 @@ typedef void* voidpointer;
 #endif
 #endif
 
+#ifndef luaTeX /* everything */
+
 /* Some things are the same except for the name.  */
 #ifdef TeX
 #if defined (pdfTeX)
@@ -71,7 +73,7 @@ typedef void* voidpointer;
 #endif
 #define DUMP_FILE fmtfile
 #define DUMP_FORMAT kpse_fmt_format
-#define writedvi write_out
+#define writedvi WRITE_OUT
 #define flushdvi flush_out
 #define OUT_FILE dvifile
 #define OUT_BUF dvibuf
@@ -81,7 +83,7 @@ typedef void* voidpointer;
 #define TEXMFENGINENAME "metafont"
 #define DUMP_FILE basefile
 #define DUMP_FORMAT kpse_base_format
-#define writegf write_out
+#define writegf WRITE_OUT
 #define OUT_FILE gffile
 #define OUT_BUF gfbuf
 #endif /* MF */
@@ -109,7 +111,7 @@ extern boolean openinnameok P1H(const_string);
 extern boolean openoutnameok P1H(const_string);
 
 /* pdfTeX uses these for pipe support */
-#if defined(pdfTeX) || defined(pdfeTeX)
+#if defined(pdfTeX) || defined(pdfeTeX) || defined (luaTeX)
 extern boolean open_in_or_pipe P3H(FILE **, int, const_string fopen_mode);
 extern boolean open_out_or_pipe P2H(FILE **, const_string fopen_mode);
 extern void close_file_or_pipe P1H(FILE *);
@@ -152,10 +154,10 @@ extern void ipcpage P1H(int);
 #endif /* TeX */
 
 /* How to output to the GF or DVI file.  */
-#define	write_out(a, b)							\
-  if (fwrite ((char *) &OUT_BUF[a], sizeof (OUT_BUF[a]),		\
-                 (int) ((b) - (a) + 1), OUT_FILE) 			\
-      != (int) ((b) - (a) + 1))						\
+#define WRITE_OUT(a, b)							\
+  if ((size_t) fwrite ((char *) &OUT_BUF[a], sizeof (OUT_BUF[a]),       \
+                    (size_t) ((size_t)(b) - (size_t)(a) + 1), OUT_FILE) \
+      != (size_t) ((size_t) (b) - (size_t) (a) + 1))                    \
     FATAL_PERROR ("fwrite");
 
 #define flush_out() fflush (OUT_FILE)
@@ -219,6 +221,7 @@ extern void setupboundvariable P3H(integer *, const_string, integer);
 #define bopenin(f)	open_input (&(f), kpse_tfm_format, FOPEN_RBIN_MODE)
 #define ocpopenin(f)	open_input (&(f), kpse_ocp_format, FOPEN_RBIN_MODE)
 #define ofmopenin(f)	open_input (&(f), kpse_ofm_format, FOPEN_RBIN_MODE)
+
 #define bopenout(f)	open_output (&(f), FOPEN_WBIN_MODE)
 #define bclose		aclose
 #ifdef XeTeX
@@ -261,6 +264,7 @@ extern void blankrectangle (/*screencol, screencol, screenrow, screenrow*/);
 extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/);
 #endif
 #endif /* MF */
+
 
 /* (Un)dumping.  These are called from the change file.  */
 #define	dumpthings(base, len) \
@@ -281,7 +285,7 @@ extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/);
       if ((&(base))[i] < (low) || (&(base))[i] > (high)) {              \
         FATAL5 ("Item %u (=%ld) of .fmt array at %lx <%ld or >%ld",     \
                 i, (unsigned long) (&(base))[i], (unsigned long) &(base),\
-                (unsigned long) low, (unsigned long) high);             \
+                (unsigned long) low, (integer) high);                   \
       }                                                                 \
     }									\
   } while (0)
@@ -297,7 +301,7 @@ extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/);
       if ((&(base))[i] > (high)) {              			\
         FATAL4 ("Item %u (=%ld) of .fmt array at %lx >%ld",     	\
                 i, (unsigned long) (&(base))[i], (unsigned long) &(base),\
-                (unsigned long) high);                         		\
+                (integer) high);                         		\
       }                                                                 \
     }									\
   } while (0)
@@ -347,3 +351,201 @@ extern void do_undump P4H(char *, int, int, FILE *);
 #else
 #define	undumpint generic_undump
 #endif
+
+
+#else  /* this is for luaTeX */
+
+/* Some things are the same except for the name.  */
+
+#define TEXMFPOOLNAME "luatex.pool"
+#define TEXMFENGINENAME "luatex"
+
+#define DUMP_FILE fmt_file
+#define DUMP_FORMAT kpse_fmt_format
+#define write_dvi WRITE_OUT
+#define flush_dvi flush_out
+#define OUT_FILE dvi_file
+#define OUT_BUF dvi_buf
+
+/* Restore underscores.  */
+#define kpsetexformat kpse_tex_format
+#define mainbody main_body
+#define t_open_in topenin
+
+/* Hacks for TeX that are better not to #ifdef, see texmfmp.c.  */
+extern int tfmtemp, texinputtype;
+
+/* TeX, MF and MetaPost use this.  */
+extern boolean openinnameok P1H(const_string);
+extern boolean openoutnameok P1H(const_string);
+
+/* pdfTeX uses these for pipe support */
+extern boolean open_in_or_pipe P3H(FILE **, int, const_string fopen_mode);
+extern boolean open_out_or_pipe P2H(FILE **, const_string fopen_mode);
+extern void close_file_or_pipe P1H(FILE *);
+
+#ifndef GLUERATIO_TYPE
+#define GLUERATIO_TYPE double
+#endif
+typedef GLUERATIO_TYPE glueratio;
+
+#if defined(__DJGPP__) && defined (IPC)
+#undef IPC
+#endif
+
+#ifdef IPC
+extern void ipcpage P1H(int);
+#endif /* IPC */
+
+
+/* How to output to the GF or DVI file.  */
+#define	WRITE_OUT(a, b)							\
+  if (fwrite ((char *) &OUT_BUF[a], sizeof (OUT_BUF[a]),		\
+                 (int) ((b) - (a) + 1), OUT_FILE) 			\
+      != (int) ((b) - (a) + 1))						\
+    FATAL_PERROR ("fwrite");
+
+#define flush_out() fflush (OUT_FILE)
+
+/* Read a line of input as quickly as possible.  */
+#define	input_ln(stream, flag) input_line (stream)
+
+extern boolean input_line P1H(FILE *);
+
+/* This routine has to return four values.  */
+#define	dateandtime(i,j,k,l) get_date_and_time (&(i), &(j), &(k), &(l))
+extern void get_date_and_time P4H(integer *, integer *, integer *, integer *);
+
+/* Get high-res time info. */
+#define seconds_and_micros(i,j) get_seconds_and_micros (&(i), &(j))
+extern void get_seconds_and_micros P2H(integer *, integer *);
+
+/* This routine has to return a scaled value. */
+extern integer getrandomseed P1H(void);
+
+/* Copy command-line arguments into the buffer, despite the name.  */
+extern void topenin P1H(void);
+
+/* Can't prototype this since it uses poolpointer and ASCIIcode, which
+   are defined later in mfd.h, and mfd.h uses stuff from here.  */
+/* Therefore the department of ugly hacks decided to move this declaration
+   to the *coerce.h files. */
+/* extern void calledit (); */
+
+/* Set an array size from texmf.cnf.  */
+extern void setupboundvariable P3H(integer *, const_string, integer);
+
+/* These defines reroute the file i/o calls to the new pipe-enabled 
+   functions in texmfmp.c*/
+
+#undef aopenin
+#undef aopenout
+#undef aclose
+#define a_open_in(f,p)  open_in_or_pipe(&(f),p,FOPEN_RBIN_MODE)
+#define a_open_out(f)   open_out_or_pipe(&(f),FOPEN_W_MODE)
+#define a_close(f)     close_file_or_pipe(f)
+
+/* `bopenin' (and out) is used only for reading (and writing) .tfm
+   files; `wopenin' (and out) only for dump files.  The filenames are
+   passed in as a global variable, `nameoffile'.  */
+#define b_open_in(f)	open_input (&(f), kpse_tfm_format, FOPEN_RBIN_MODE)
+#define ocp_open_in(f)	open_input (&(f), kpse_ocp_format, FOPEN_RBIN_MODE)
+#define ofm_open_in(f)	open_input (&(f), kpse_ofm_format, FOPEN_RBIN_MODE)
+#define b_open_out(f)	open_output (&(f), FOPEN_WBIN_MODE)
+
+/* Used in tex.ch (section 1338) to get a core dump in debugging mode.  */
+#ifdef unix
+#define dumpcore abort
+#else
+#define dumpcore uexit (1)
+#endif
+
+#define b_close close_file
+/* (Un)dumping.  These are called from the change file.  */
+#define        dump_things(base, len) \
+  do_zdump ((char *) &(base), sizeof (base), (int) (len), DUMP_FILE)
+#define        undump_things(base, len) \
+  do_zundump ((char *) &(base), sizeof (base), (int) (len), DUMP_FILE)
+/* We define the routines to do the actual work in texmf.c.  */
+#define w_open_in(f)     zopen_w_input (&(f), DUMP_FORMAT, FOPEN_RBIN_MODE)
+#define w_open_out(f)    zopen_w_output (&(f), FOPEN_WBIN_MODE)
+#define w_close         zwclose
+
+extern boolean zopen_w_input P3H(FILE **, int, const_string fopen_mode);
+extern boolean zopen_w_output P2H(FILE **, const_string fopen_mode);
+extern void do_zdump P4H(char *, int, int, FILE *);
+extern void do_zundump P4H(char *, int, int, FILE *);
+extern void zwclose P1H(FILE *);
+
+/* Like do_undump, but check each value against LOW and HIGH.  The
+   slowdown isn't significant, and this improves the chances of
+   detecting incompatible format files.  In fact, Knuth himself noted
+   this problem with Web2c some years ago, so it seems worth fixing.  We
+   can't make this a subroutine because then we lose the type of BASE.  */
+#define undump_checked_things(low, high, base, len)						\
+  do {                                                                  \
+    unsigned i;                                                         \
+    undump_things (base, len);                                           \
+    for (i = 0; i < (len); i++) {                                       \
+      if ((&(base))[i] < (low) || (&(base))[i] > (high)) {              \
+        FATAL5 ("Item %u (=%ld) of .fmt array at %lx <%ld or >%ld",     \
+                i, (unsigned long) (&(base))[i], (unsigned long) &(base),     \
+                (unsigned long) low, (integer) high);                         \
+      }                                                                 \
+    }																	\
+  } while (0)
+
+/* Like undump_checked_things, but only check the upper value. We use
+   this when the base type is unsigned, and thus all the values will be
+   greater than zero by definition.  */
+#define undump_upper_check_things(high, base, len)							\
+  do {                                                                  \
+    unsigned i;                                                         \
+    undump_things (base, len);                                           \
+    for (i = 0; i < (len); i++) {                                       \
+      if ((&(base))[i] > (high)) {										\
+        FATAL4 ("Item %u (=%ld) of .fmt array at %lx >%ld",				\
+                i, (unsigned long) (&(base))[i], (unsigned long) &(base),		\
+                (unsigned long) high);										\
+      }                                                                 \
+    }																	\
+  } while (0)
+
+/* Use the above for all the other dumping and undumping.  */
+#define generic_dump(x) dump_things (x, 1)
+#define generic_undump(x) undump_things (x, 1)
+
+#define dump_wd   generic_dump
+#define dump_hh   generic_dump
+#define dump_qqqq generic_dump
+#define undump_wd   generic_undump
+#define undump_hh   generic_undump
+#define	undump_qqqq generic_undump
+
+/* `dump_int' is called with constant integers, so we put them into a
+   variable first.  */
+#define	dump_int(x)							\
+  do									\
+    {									\
+      integer x_val = (x);						\
+      generic_dump (x_val);						\
+    }									\
+  while (0)
+
+/* web2c/regfix puts variables in the format file loading into
+   registers.  Some compilers aren't willing to take addresses of such
+   variables.  So we must kludge.  */
+#if defined(REGFIX) || defined(WIN32)
+#define undump_int(x)							\
+  do									\
+    {									\
+      integer x_val;							\
+      generic_undump (x_val);						\
+      x = x_val;							\
+    }									\
+  while (0)
+#else
+#define	undump_int generic_undump
+#endif /* not (REGFIX || WIN32) */
+
+#endif /* luaTeX */
diff --git a/Build/source/texk/web2c/web2c/coerce.h b/Build/source/texk/web2c/web2c/coerce.h
index 7f5bfa2cd79..db0b13563d5 100644
--- a/Build/source/texk/web2c/web2c/coerce.h
+++ b/Build/source/texk/web2c/web2c/coerce.h
@@ -54,9 +54,11 @@ extern void remembersourceinfo P2H(strnumber, int);
 #include <luatexdir/luatex.h>
 #endif /* luaTeX */
 
-#ifdef pdfTeX
+/* When compiling the lib in luatexdir, we -DpdfTeX so code can be more
+   easily shared.  But we can't have both pdftexd.h and luatexd.h, etc.  */
+#if defined (pdfTeX) && !defined (luaTeX)
 #include <pdftexdir/pdftex.h>
-#endif /* pdfTeX */
+#endif /* pdfTeX and not luaTeX */
 
 #ifdef XeTeX
 #include <xetexdir/xetex.h>
diff --git a/Build/source/texk/web2c/web2c/common.defines b/Build/source/texk/web2c/web2c/common.defines
index 86cffa7a2bb..59389314e5f 100644
--- a/Build/source/texk/web2c/web2c/common.defines
+++ b/Build/source/texk/web2c/web2c/common.defines
@@ -69,6 +69,8 @@
 @define const GFTODVIHELP;
 @define const GFTOPKHELP;
 @define const GFTYPEHELP;
+@define const LUATANGLEHELP;
+@define const LUATEXHELP;
 @define const MFTHELP;
 @define const ODVICOPYHELP;
 @define const ODVITYPEHELP;
diff --git a/Build/source/texk/web2c/web2c/web2c.l b/Build/source/texk/web2c/web2c/web2c.l
index 8f0194c49aa..40cedd4ceec 100644
--- a/Build/source/texk/web2c/web2c/web2c.l
+++ b/Build/source/texk/web2c/web2c/web2c.l
@@ -1,5 +1,5 @@
 %{
-/* web2c.l -- lexical analysis for Tangle output.  Public domain.  */
+/* web2c.l -- lexical analysis for Tangle output.  Public domain. */
 
 #include "web2c.h"
 #include "y_tab.h"
@@ -33,7 +33,7 @@ yywrap P1H(void)
 %}
 DIGIT		[0-9]
 ALPHA		[a-zA-Z]
-ALPHANUM	({DIGIT}|{ALPHA})
+ALPHANUM	({DIGIT}|{ALPHA}|"_")
 IDENTIFIER	({ALPHA}{ALPHANUM}*)
 NUMBER		({DIGIT}+)
 SIGN		("+"|"-")
@@ -109,9 +109,9 @@ HHB1		("hh"{WW}"."{WW}"b1")
 		}
 
 
-"procedure "[a-z]+";"[ \n\t]*"forward;"	;
+"procedure "[a-z_]+";"[ \n\t]*"forward;"	;
 
-"function "[(),:a-z]+";"[ \n\t]*"forward;"	;
+"function "[(),:a-z_]+";"[ \n\t]*"forward;"	;
 
 "@define"	return last_tok=define_tok;
 "@field"	return last_tok=field_tok;
diff --git a/Build/source/texk/web2c/withenable.ac b/Build/source/texk/web2c/withenable.ac
index 1a276873754..7f8aa0d0e7b 100644
--- a/Build/source/texk/web2c/withenable.ac
+++ b/Build/source/texk/web2c/withenable.ac
@@ -28,6 +28,11 @@ dnl We default to yes if the sources are available.
 AC_ARG_WITH([pdfetex],
 [  --without-pdfetex          don't compile and install pdfeTeX])
 
+dnl Do we compile luaTeX?
+dnl We default to yes if the sources are available.
+AC_ARG_WITH([luatex],
+[  --without-luatex           don't compile and install pdfTeX])
+
 dnl Do we compile XeTeX?
 dnl We default to yes if the sources are available.
 AC_ARG_WITH([xetex],