towards TL2010: texk/ misc

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

1 files changed, 1033 insertions, 1158 deletions

diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 3330dce26d8..1f2621cd579 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -1,20 +1,22 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for TeX Live texk 2009.
+# Generated by GNU Autoconf 2.64 for TeX Live texk 2009.
 #
 # Report bugs to <peb@mppmu.mpg.de>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +40,13 @@ export as_nl
 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
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +57,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +89,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +109,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +130,299 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # 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
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
-if as_func_ret_success; then
-  :
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # 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
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # 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
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      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
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and peb@mppmu.mpg.de
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
 fi
-
-
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
 
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
-exitcode=0
-if as_func_success; then
-  :
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
 
-if as_func_ret_success; then
-  :
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  as_expr=false
 fi
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  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.
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -473,8 +439,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -484,29 +449,18 @@ test \$exitcode = 0") || {
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -536,7 +490,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -555,10 +509,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -572,7 +526,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-
 exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
@@ -591,7 +544,6 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='TeX Live texk'
@@ -599,6 +551,7 @@ PACKAGE_TARNAME='tex-live-texk'
 PACKAGE_VERSION='2009'
 PACKAGE_STRING='TeX Live texk 2009'
 PACKAGE_BUGREPORT='peb@mppmu.mpg.de'
+PACKAGE_URL=''
 
 ac_unique_file="../build-aux/missing"
 enable_option_checking=no
@@ -671,6 +624,7 @@ bindir
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -725,6 +679,7 @@ enable_mp
 enable_web_progs
 enable_afm2pl
 enable_bibtex8
+enable_bibtexu
 enable_cjkutils
 enable_detex
 enable_devnag
@@ -777,13 +732,12 @@ enable_mkocp_default
 enable_mkofm_default
 enable_mktexfmt_default
 enable_mktextex_default
+with_system_icu
 with_system_teckit
 with_teckit_includes
 with_teckit_libdir
 with_graphite
 with_system_graphite
-with_graphite_includes
-with_graphite_libdir
 with_system_xpdf
 with_system_gd
 with_gd_includes
@@ -806,10 +760,10 @@ enable_maintainer_mode
       ac_precious_vars='build_alias
 host_alias
 target_alias'
-ac_subdirs_all='dummy
-web2c
+ac_subdirs_all='web2c
 afm2pl
 bibtex8
+bibtexu
 cjkutils
 detex
 devnag
@@ -943,8 +897,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -970,8 +923,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1175,8 +1127,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1192,8 +1143,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1223,17 +1173,17 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     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 &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1250,15 +1200,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1281,8 +1229,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1312,11 +1259,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1355,13 +1300,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1512,6 +1455,7 @@ Optional Features:
   --disable-web-progs       do not build WEB programs bibtex ... weave
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex8       do not build the bibtex8 package
+  --disable-bibtexu       do not build the bibtexu package
   --disable-cjkutils      do not build the cjkutils package
   --disable-detex         do not build the detex package
   --disable-devnag        do not build the devnag package
@@ -1584,17 +1528,16 @@ Optional Packages:
                           kpathsea headers installed in DIR
   --with-kpathsea-libdir=DIR
                           kpathsea library installed in DIR
+  --with-system-icu       use installed ICU headers and libraries (requires
+                          icu-config, not for XeTeX)
   --with-system-teckit    use installed teckit headers and library
   --with-teckit-includes=DIR
                           teckit headers installed in DIR
   --with-teckit-libdir=DIR
                           teckit library installed in DIR
   --without-graphite      build XeTeX without graphite support
-  --with-system-graphite  use installed graphite headers and library
-  --with-graphite-includes=DIR
-                          graphite headers installed in DIR
-  --with-graphite-libdir=DIR
-                          graphite library installed in DIR
+  --with-system-graphite  use installed silgraphite headers and library
+                          (requires pkg-config)
   --with-system-xpdf      use installed poppler headers and library instead of
                           xpdf (requires pkg-config)
   --with-system-gd        use installed gd headers and library
@@ -1685,21 +1628,24 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 TeX Live texk configure 2009
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.64
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by TeX Live texk $as_me 2009, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
 
@@ -1735,8 +1681,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1773,9 +1719,9 @@ do
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1791,13 +1737,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1822,13 +1768,13 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$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 ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1900,39 +1846,41 @@ _ASBOX
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
@@ -1951,7 +1899,7 @@ 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
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+    { $as_echo "$as_me:${as_lineno-$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"
@@ -1962,7 +1910,7 @@ 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
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1970,7 +1918,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1985,11 +1933,11 @@ 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,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$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)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$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=: ;;
     ,);;
@@ -1999,17 +1947,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -2021,43 +1969,20 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$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; }; }
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2070,24 +1995,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_aux_dir=
 for ac_dir in ../build-aux "$srcdir"/../build-aux; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../build-aux \"$srcdir\"/../build-aux" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in ../build-aux \"$srcdir\"/../build-aux" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find install-sh, install.sh, or shtool in ../build-aux \"$srcdir\"/../build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2102,41 +2019,33 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 # Check whether --enable-missing was given.
-if test "${enable_missing+set}" = set; then
+if test "${enable_missing+set}" = set; then :
   enableval=$enable_missing;
 fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $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; }; }
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if test "${ac_cv_build+set}" = set; then :
   $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 &&
-  { { $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; }; }
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $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; }; }
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $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; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2152,28 +2061,24 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if test "${ac_cv_host+set}" = set; then :
   $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` ||
-    { { $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; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $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; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2193,57 +2098,59 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 # Check whether --enable-all-pkgs was given.
-if test "${enable_all_pkgs+set}" = set; then
+if test "${enable_all_pkgs+set}" = set; then :
   enableval=$enable_all_pkgs;
 fi
 test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes
 # Check whether --enable-native-texlive-build was given.
-if test "${enable_native_texlive_build+set}" = set; then
+if test "${enable_native_texlive_build+set}" = set; then :
   enableval=$enable_native_texlive_build;
 fi
-case $enable_native_texlive_build in
-  yes | no) : ;;
-  *) enable_native_texlive_build=yes
+case $enable_native_texlive_build in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    enable_native_texlive_build=yes
          ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;;
 esac
-
 if test "x$enable_native_texlive_build" = xyes; then
-  case $enable_multiplatform in
-  yes | no) : ;;
-  *) enable_multiplatform=yes
+  case $enable_multiplatform in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    enable_multiplatform=yes
            ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;;
 esac
-
-  case $enable_cxx_runtime_hack in
-  yes | no) : ;;
-  *) enable_cxx_runtime_hack=yes
+  case $enable_cxx_runtime_hack in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    enable_cxx_runtime_hack=yes
            ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;;
 esac
-
 fi
-case $enable_shared in
-  no) : ;;
-  yes ) if test "x$enable_native_texlive_build" = xyes; then
-  { { $as_echo "$as_me:$LINENO: error: you can not use a shared Kpathsea library for a native TeX Live build" >&5
-$as_echo "$as_me: error: you can not use a shared Kpathsea library for a native TeX Live build" >&2;}
-   { (exit 1); exit 1; }; }
-fi
- ;;
-  *) enable_shared=no
+case $enable_shared in #(
+  no) :
+    : ;; #(
+  yes ) :
+    if test "x$enable_native_texlive_build" = xyes; then :
+  as_fn_error "you can not use a shared Kpathsea library for a native TeX Live build" "$LINENO" 5
+fi ;; #(
+  *) :
+    enable_shared=no
          ac_configure_args="$ac_configure_args '--disable-shared'" ;;
 esac
-
-case $enable_texlive_build in
-  yes) : ;;
-  no) { { $as_echo "$as_me:$LINENO: error: you can not configure the TeX Live tree with \`--disable-texlive-build'" >&5
-$as_echo "$as_me: error: you can not configure the TeX Live tree with \`--disable-texlive-build'" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  *) enable_texlive_build=yes
+case $enable_texlive_build in #(
+  yes) :
+    : ;; #(
+  no) :
+    as_fn_error "you can not configure the TeX Live tree with \`--disable-texlive-build'" "$LINENO" 5 ;; #(
+  *) :
+    enable_texlive_build=yes
          ac_configure_args="$ac_configure_args '--enable-texlive-build'" ;;
 esac
-
 # Check whether --enable-multiplatform was given.
-if test "${enable_multiplatform+set}" = set; then
+if test "${enable_multiplatform+set}" = set; then :
   enableval=$enable_multiplatform;
 fi
 if test "x$enable_multiplatform" = xyes; then
@@ -2258,30 +2165,31 @@ if test "x$enable_multiplatform" = xyes; then
 fi
 
 # Check whether --enable-cxx-runtime-hack was given.
-if test "${enable_cxx_runtime_hack+set}" = set; then
+if test "${enable_cxx_runtime_hack+set}" = set; then :
   enableval=$enable_cxx_runtime_hack;
 fi
 
 
 
-case $with_x in
-  yes | no) : ;;
-  *) with_x=yes
-         { $as_echo "$as_me:$LINENO: Assuming \`--with-x'" >&5
+case $with_x in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    with_x=yes
+         { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-x'" >&5
 $as_echo "$as_me: Assuming \`--with-x'" >&6;}
          ac_configure_args="$ac_configure_args '--with-x'" ;;
 esac
-
 ## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/
 ## configure options and TL libraries required for dialog
 # Check whether --enable-dialog was given.
-if test "${enable_dialog+set}" = set; then
+if test "${enable_dialog+set}" = set; then :
   enableval=$enable_dialog;
 fi
 case $enable_dialog in #(
   yes|no);; #(
   *) enable_dialog=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog=$enable_dialog'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dialog=$enable_dialog'" >&5
 $as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dialog=$enable_dialog'";;
 esac
@@ -2289,27 +2197,27 @@ esac
 
 ## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/
 ## configure options and TL libraries required for pdfopen
-if test "x$with_x" = xno; then
-  case $enable_pdfopen in
-  "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-pdfopen'" >&5
+if test "x$with_x" = xno; then :
+  case $enable_pdfopen in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-pdfopen'" >&5
 $as_echo "$as_me: \`--without-x' -> \`--disable-pdfopen'" >&6;}
                       enable_pdfopen=no
-                      ac_configure_args="$ac_configure_args '--disable-pdfopen'" ;;
-  yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&5
-$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&2;}
-   { (exit 1); exit 1; }; } ;;
+                      ac_configure_args="$ac_configure_args '--disable-pdfopen'" ;; #(
+  yes) :
+    as_fn_error "Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" "$LINENO" 5 ;; #(
+  *) :
+     ;;
 esac
-
 fi
-
 # Check whether --enable-pdfopen was given.
-if test "${enable_pdfopen+set}" = set; then
+if test "${enable_pdfopen+set}" = set; then :
   enableval=$enable_pdfopen;
 fi
 case $enable_pdfopen in #(
   yes|no);; #(
   *) enable_pdfopen=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&5
 $as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-pdfopen=$enable_pdfopen'";;
 esac
@@ -2318,13 +2226,13 @@ esac
 ## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/
 ## configure options and TL libraries required for ps2eps
 # Check whether --enable-ps2eps was given.
-if test "${enable_ps2eps+set}" = set; then
+if test "${enable_ps2eps+set}" = set; then :
   enableval=$enable_ps2eps;
 fi
 case $enable_ps2eps in #(
   yes|no);; #(
   *) enable_ps2eps=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
 $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'";;
 esac
@@ -2333,13 +2241,13 @@ esac
 ## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/
 ## configure options and TL libraries required for psutils
 # Check whether --enable-psutils was given.
-if test "${enable_psutils+set}" = set; then
+if test "${enable_psutils+set}" = set; then :
   enableval=$enable_psutils;
 fi
 case $enable_psutils in #(
   yes|no);; #(
   *) enable_psutils=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils=$enable_psutils'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-psutils=$enable_psutils'" >&5
 $as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'";;
 esac
@@ -2348,13 +2256,13 @@ esac
 ## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
 ## configure options and TL libraries required for t1utils
 # Check whether --enable-t1utils was given.
-if test "${enable_t1utils+set}" = set; then
+if test "${enable_t1utils+set}" = set; then :
   enableval=$enable_t1utils;
 fi
 case $enable_t1utils in #(
   yes|no);; #(
   *) enable_t1utils=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
 $as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'";;
 esac
@@ -2363,13 +2271,13 @@ esac
 ## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/
 ## configure options and TL libraries required for tpic2pdftex
 # Check whether --enable-tpic2pdftex was given.
-if test "${enable_tpic2pdftex+set}" = set; then
+if test "${enable_tpic2pdftex+set}" = set; then :
   enableval=$enable_tpic2pdftex;
 fi
 case $enable_tpic2pdftex in #(
   yes|no);; #(
   *) enable_tpic2pdftex=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
 $as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'";;
 esac
@@ -2378,13 +2286,13 @@ esac
 ## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/
 ## configure options and TL libraries required for vlna
 # Check whether --enable-vlna was given.
-if test "${enable_vlna+set}" = set; then
+if test "${enable_vlna+set}" = set; then :
   enableval=$enable_vlna;
 fi
 case $enable_vlna in #(
   yes|no);; #(
   *) enable_vlna=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna=$enable_vlna'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-vlna=$enable_vlna'" >&5
 $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'";;
 esac
@@ -2393,13 +2301,13 @@ esac
 ## utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure options and TL libraries required for xindy
 # Check whether --enable-xindy was given.
-if test "${enable_xindy+set}" = set; then
+if test "${enable_xindy+set}" = set; then :
   enableval=$enable_xindy;
 fi
 case $enable_xindy in #(
   yes|no);; #(
   *) enable_xindy=no
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xindy=$enable_xindy'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy=$enable_xindy'" >&5
 $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'";;
 esac
@@ -2407,16 +2315,16 @@ esac
 ## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure options for xindy
 # Check whether --enable-xindy-rules was given.
-if test "${enable_xindy_rules+set}" = set; then
+if test "${enable_xindy_rules+set}" = set; then :
   enableval=$enable_xindy_rules;
 fi
 # Check whether --enable-xindy-docs was given.
-if test "${enable_xindy_docs+set}" = set; then
+if test "${enable_xindy_docs+set}" = set; then :
   enableval=$enable_xindy_docs;
 fi
 
 # Check whether --with-xindy-recode was given.
-if test "${with_xindy_recode+set}" = set; then
+if test "${with_xindy_recode+set}" = set; then :
   withval=$with_xindy_recode;
 fi
 
@@ -2425,13 +2333,13 @@ fi
 ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
 # Check whether --enable-web2c was given.
-if test "${enable_web2c+set}" = set; then
+if test "${enable_web2c+set}" = set; then :
   enableval=$enable_web2c;
 fi
 case $enable_web2c in #(
   yes|no);; #(
   *) enable_web2c=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c=$enable_web2c'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-web2c=$enable_web2c'" >&5
 $as_echo "$as_me: Assuming \`--enable-web2c=$enable_web2c'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-web2c=$enable_web2c'";;
 esac
@@ -2445,62 +2353,70 @@ test "x$enable_web2c" = xno || {
 ## configure options for TeX and MF
 
 # Check whether --with-tex-banner was given.
-if test "${with_tex_banner+set}" = set; then
+if test "${with_tex_banner+set}" = set; then :
   withval=$with_tex_banner;
 fi
 
 # Check whether --with-editor was given.
-if test "${with_editor+set}" = set; then
+if test "${with_editor+set}" = set; then :
   withval=$with_editor;
 fi
 # Check whether --enable-auto-core was given.
-if test "${enable_auto_core+set}" = set; then
+if test "${enable_auto_core+set}" = set; then :
   enableval=$enable_auto_core;
 fi
 # Check whether --enable-dump-share was given.
-if test "${enable_dump_share+set}" = set; then
+if test "${enable_dump_share+set}" = set; then :
   enableval=$enable_dump_share;
 fi
 ## configure options for TeX
 # Check whether --enable-ipc was given.
-if test "${enable_ipc+set}" = set; then
+if test "${enable_ipc+set}" = set; then :
   enableval=$enable_ipc;
 fi
 # Check whether --enable-omfonts was given.
-if test "${enable_omfonts+set}" = set; then
+if test "${enable_omfonts+set}" = set; then :
   enableval=$enable_omfonts;
 fi
 # Check whether --enable-tex was given.
-if test "${enable_tex+set}" = set; then
+if test "${enable_tex+set}" = set; then :
   enableval=$enable_tex;
 fi
-case $enable_tex in
-  yes|no) : ;;
-  *) enable_tex=yes ;;
+case $enable_tex in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_tex=yes ;;
 esac
 # Check whether --enable-etex was given.
-if test "${enable_etex+set}" = set; then
+if test "${enable_etex+set}" = set; then :
   enableval=$enable_etex;
 fi
-case $enable_etex in
-  yes|no) : ;;
-  *) enable_etex=no ;;
+case $enable_etex in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_etex=no ;;
 esac
 # Check whether --enable-aleph was given.
-if test "${enable_aleph+set}" = set; then
+if test "${enable_aleph+set}" = set; then :
   enableval=$enable_aleph;
 fi
-case $enable_aleph in
-  yes|no) : ;;
-  *) enable_aleph=yes ;;
+case $enable_aleph in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_aleph=yes ;;
 esac
 # Check whether --enable-pdftex was given.
-if test "${enable_pdftex+set}" = set; then
+if test "${enable_pdftex+set}" = set; then :
   enableval=$enable_pdftex;
 fi
-case $enable_pdftex in
-  yes|no) : ;;
-  *) enable_pdftex=yes ;;
+case $enable_pdftex in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_pdftex=yes ;;
 esac
 
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
@@ -2509,12 +2425,14 @@ test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_obsdcompat=yes
 }
 # Check whether --enable-luatex was given.
-if test "${enable_luatex+set}" = set; then
+if test "${enable_luatex+set}" = set; then :
   enableval=$enable_luatex;
 fi
-case $enable_luatex in
-  yes|no) : ;;
-  *) enable_luatex=yes ;;
+case $enable_luatex in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_luatex=yes ;;
 esac
 
 test "x$enable_web2c:$enable_luatex" = xyes:yes && {
@@ -2523,76 +2441,78 @@ test "x$enable_web2c:$enable_luatex" = xyes:yes && {
   need_obsdcompat=yes
 }
 # Check whether --enable-xetex was given.
-if test "${enable_xetex+set}" = set; then
+if test "${enable_xetex+set}" = set; then :
   enableval=$enable_xetex;
 fi
-case $enable_xetex in
-  yes|no) : ;;
-  *) enable_xetex=yes ;;
+case $enable_xetex in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_xetex=yes ;;
 esac
 
 test "x$enable_web2c:$enable_xetex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_freetype2=yes
-  need_icu=yes
+  need_icu_xetex=yes
   need_teckit=yes
   need_graphite=yes
 }
 ## configure options for MF
 # Check whether --enable-mf was given.
-if test "${enable_mf+set}" = set; then
+if test "${enable_mf+set}" = set; then :
   enableval=$enable_mf;
 fi
 # Check whether --enable-mf-nowin was given.
-if test "${enable_mf_nowin+set}" = set; then
+if test "${enable_mf_nowin+set}" = set; then :
   enableval=$enable_mf_nowin;
 fi
 
 # Check whether --with-mf-x-toolkit was given.
-if test "${with_mf_x_toolkit+set}" = set; then
+if test "${with_mf_x_toolkit+set}" = set; then :
   withval=$with_mf_x_toolkit;
 fi
 # Check whether --enable-epsfwin was given.
-if test "${enable_epsfwin+set}" = set; then
+if test "${enable_epsfwin+set}" = set; then :
   enableval=$enable_epsfwin;
 fi
 # Check whether --enable-hp2627win was given.
-if test "${enable_hp2627win+set}" = set; then
+if test "${enable_hp2627win+set}" = set; then :
   enableval=$enable_hp2627win;
 fi
 # Check whether --enable-mftalkwin was given.
-if test "${enable_mftalkwin+set}" = set; then
+if test "${enable_mftalkwin+set}" = set; then :
   enableval=$enable_mftalkwin;
 fi
 # Check whether --enable-nextwin was given.
-if test "${enable_nextwin+set}" = set; then
+if test "${enable_nextwin+set}" = set; then :
   enableval=$enable_nextwin;
 fi
 # Check whether --enable-regiswin was given.
-if test "${enable_regiswin+set}" = set; then
+if test "${enable_regiswin+set}" = set; then :
   enableval=$enable_regiswin;
 fi
 # Check whether --enable-suntoolswin was given.
-if test "${enable_suntoolswin+set}" = set; then
+if test "${enable_suntoolswin+set}" = set; then :
   enableval=$enable_suntoolswin;
 fi
 # Check whether --enable-tektronixwin was given.
-if test "${enable_tektronixwin+set}" = set; then
+if test "${enable_tektronixwin+set}" = set; then :
   enableval=$enable_tektronixwin;
 fi
 # Check whether --enable-unitermwin was given.
-if test "${enable_unitermwin+set}" = set; then
+if test "${enable_unitermwin+set}" = set; then :
   enableval=$enable_unitermwin;
 fi
 ## configure options for MP
 # Check whether --enable-mp was given.
-if test "${enable_mp+set}" = set; then
+if test "${enable_mp+set}" = set; then :
   enableval=$enable_mp;
 fi
 ## configure options for WEB programs
 # Check whether --enable-web-progs was given.
-if test "${enable_web_progs+set}" = set; then
+if test "${enable_web_progs+set}" = set; then :
   enableval=$enable_web_progs;
 fi
 
@@ -2600,13 +2520,13 @@ fi
 ## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
 ## configure options and TL libraries required for afm2pl
 # Check whether --enable-afm2pl was given.
-if test "${enable_afm2pl+set}" = set; then
+if test "${enable_afm2pl+set}" = set; then :
   enableval=$enable_afm2pl;
 fi
 case $enable_afm2pl in #(
   yes|no);; #(
   *) enable_afm2pl=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
 $as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'";;
 esac
@@ -2619,13 +2539,13 @@ test "x$enable_afm2pl" = xno || {
 ## texk/bibtex8/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex8/
 ## configure options and TL libraries required for bibtex8
 # Check whether --enable-bibtex8 was given.
-if test "${enable_bibtex8+set}" = set; then
+if test "${enable_bibtex8+set}" = set; then :
   enableval=$enable_bibtex8;
 fi
 case $enable_bibtex8 in #(
   yes|no);; #(
   *) enable_bibtex8=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&5
 $as_echo "$as_me: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-bibtex8=$enable_bibtex8'";;
 esac
@@ -2635,16 +2555,36 @@ test "x$enable_bibtex8" = xno || {
 }
 
 
+## texk/bibtexu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtexu/
+## configure options and TL libraries required for bibtexu
+# Check whether --enable-bibtexu was given.
+if test "${enable_bibtexu+set}" = set; then :
+  enableval=$enable_bibtexu;
+fi
+case $enable_bibtexu in #(
+  yes|no);; #(
+  *) enable_bibtexu=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-bibtexu=$enable_bibtexu'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtexu=$enable_bibtexu'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtexu=$enable_bibtexu'";;
+esac
+
+test "x$enable_bibtexu" = xno || {
+  need_kpathsea=yes
+  need_icu=yes
+}
+
+
 ## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/
 ## configure options and TL libraries required for cjkutils
 # Check whether --enable-cjkutils was given.
-if test "${enable_cjkutils+set}" = set; then
+if test "${enable_cjkutils+set}" = set; then :
   enableval=$enable_cjkutils;
 fi
 case $enable_cjkutils in #(
   yes|no);; #(
   *) enable_cjkutils=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
 $as_echo "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'";;
 esac
@@ -2657,13 +2597,13 @@ test "x$enable_cjkutils" = xno || {
 ## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/
 ## configure options and TL libraries required for detex
 # Check whether --enable-detex was given.
-if test "${enable_detex+set}" = set; then
+if test "${enable_detex+set}" = set; then :
   enableval=$enable_detex;
 fi
 case $enable_detex in #(
   yes|no);; #(
   *) enable_detex=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex=$enable_detex'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-detex=$enable_detex'" >&5
 $as_echo "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'";;
 esac
@@ -2676,13 +2616,13 @@ test "x$enable_detex" = xno || {
 ## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
 ## configure options and TL libraries required for devnag
 # Check whether --enable-devnag was given.
-if test "${enable_devnag+set}" = set; then
+if test "${enable_devnag+set}" = set; then :
   enableval=$enable_devnag;
 fi
 case $enable_devnag in #(
   yes|no);; #(
   *) enable_devnag=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag=$enable_devnag'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
 $as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'";;
 esac
@@ -2691,13 +2631,13 @@ esac
 ## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
 ## configure options and TL libraries required for dtl
 # Check whether --enable-dtl was given.
-if test "${enable_dtl+set}" = set; then
+if test "${enable_dtl+set}" = set; then :
   enableval=$enable_dtl;
 fi
 case $enable_dtl in #(
   yes|no);; #(
   *) enable_dtl=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl=$enable_dtl'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dtl=$enable_dtl'" >&5
 $as_echo "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'";;
 esac
@@ -2710,13 +2650,13 @@ test "x$enable_dtl" = xno || {
 ## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/
 ## configure options and TL libraries required for dvi2tty
 # Check whether --enable-dvi2tty was given.
-if test "${enable_dvi2tty+set}" = set; then
+if test "${enable_dvi2tty+set}" = set; then :
   enableval=$enable_dvi2tty;
 fi
 case $enable_dvi2tty in #(
   yes|no);; #(
   *) enable_dvi2tty=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
 $as_echo "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'";;
 esac
@@ -2729,13 +2669,13 @@ test "x$enable_dvi2tty" = xno || {
 ## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/
 ## configure options and TL libraries required for dvidvi
 # Check whether --enable-dvidvi was given.
-if test "${enable_dvidvi+set}" = set; then
+if test "${enable_dvidvi+set}" = set; then :
   enableval=$enable_dvidvi;
 fi
 case $enable_dvidvi in #(
   yes|no);; #(
   *) enable_dvidvi=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
 $as_echo "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'";;
 esac
@@ -2748,13 +2688,13 @@ test "x$enable_dvidvi" = xno || {
 ## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/
 ## configure options and TL libraries required for dviljk
 # Check whether --enable-dviljk was given.
-if test "${enable_dviljk+set}" = set; then
+if test "${enable_dviljk+set}" = set; then :
   enableval=$enable_dviljk;
 fi
 case $enable_dviljk in #(
   yes|no);; #(
   *) enable_dviljk=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
 $as_echo "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'";;
 esac
@@ -2767,13 +2707,13 @@ test "x$enable_dviljk" = xno || {
 ## texk/dvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfmx/
 ## configure options and TL libraries required for dvipdfmx
 # Check whether --enable-dvipdfmx was given.
-if test "${enable_dvipdfmx+set}" = set; then
+if test "${enable_dvipdfmx+set}" = set; then :
   enableval=$enable_dvipdfmx;
 fi
 case $enable_dvipdfmx in #(
   yes|no);; #(
   *) enable_dvipdfmx=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&5
 $as_echo "$as_me: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dvipdfmx=$enable_dvipdfmx'";;
 esac
@@ -2787,13 +2727,13 @@ test "x$enable_dvipdfmx" = xno || {
 ## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
 ## configure options and TL libraries required for dvipng
 # Check whether --enable-dvipng was given.
-if test "${enable_dvipng+set}" = set; then
+if test "${enable_dvipng+set}" = set; then :
   enableval=$enable_dvipng;
 fi
 case $enable_dvipng in #(
   yes|no);; #(
   *) enable_dvipng=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
 $as_echo "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'";;
 esac
@@ -2808,18 +2748,18 @@ test "x$enable_dvipng" = xno || {
 ## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
 ## configure options for dvipng
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
+if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
 fi
 
 # Check whether --enable-timing was given.
-if test "${enable_timing+set}" = set; then
+if test "${enable_timing+set}" = set; then :
   enableval=$enable_timing;
 fi
 
 
 # Check whether --with-gs was given.
-if test "${with_gs+set}" = set; then
+if test "${with_gs+set}" = set; then :
   withval=$with_gs;
 fi
 
@@ -2828,13 +2768,13 @@ fi
 ## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/
 ## configure options and TL libraries required for dvipos
 # Check whether --enable-dvipos was given.
-if test "${enable_dvipos+set}" = set; then
+if test "${enable_dvipos+set}" = set; then :
   enableval=$enable_dvipos;
 fi
 case $enable_dvipos in #(
   yes|no);; #(
   *) enable_dvipos=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
 $as_echo "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'";;
 esac
@@ -2847,13 +2787,13 @@ test "x$enable_dvipos" = xno || {
 ## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/
 ## configure options and TL libraries required for dvipsk
 # Check whether --enable-dvipsk was given.
-if test "${enable_dvipsk+set}" = set; then
+if test "${enable_dvipsk+set}" = set; then :
   enableval=$enable_dvipsk;
 fi
 case $enable_dvipsk in #(
   yes|no);; #(
   *) enable_dvipsk=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
 $as_echo "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'";;
 esac
@@ -2866,13 +2806,13 @@ test "x$enable_dvipsk" = xno || {
 ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
 ## configure options and TL libraries required for gsftopk
 # Check whether --enable-gsftopk was given.
-if test "${enable_gsftopk+set}" = set; then
+if test "${enable_gsftopk+set}" = set; then :
   enableval=$enable_gsftopk;
 fi
 case $enable_gsftopk in #(
   yes|no);; #(
   *) enable_gsftopk=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
 $as_echo "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'";;
 esac
@@ -2885,32 +2825,28 @@ test "x$enable_gsftopk" = xno || {
 ## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/
 ## configure options and TL libraries required for lacheck
 # Check whether --enable-lacheck was given.
-if test "${enable_lacheck+set}" = set; then
+if test "${enable_lacheck+set}" = set; then :
   enableval=$enable_lacheck;
 fi
 case $enable_lacheck in #(
   yes|no);; #(
   *) enable_lacheck=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
 $as_echo "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'";;
 esac
 
-test "x$enable_lacheck" = xno || {
-  need_kpathsea=yes
-}
-
 
 ## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
 ## configure options and TL libraries required for lcdf-typetools
 # Check whether --enable-lcdf-typetools was given.
-if test "${enable_lcdf_typetools+set}" = set; then
+if test "${enable_lcdf_typetools+set}" = set; then :
   enableval=$enable_lcdf_typetools;
 fi
 case $enable_lcdf_typetools in #(
   yes|no);; #(
   *) enable_lcdf_typetools=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
 $as_echo "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'";;
 esac
@@ -2922,60 +2858,60 @@ test "x$enable_lcdf_typetools" = xno || {
 ## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
 ## configure options for lcdf-typetools
 # Check whether --enable-cfftot1 was given.
-if test "${enable_cfftot1+set}" = set; then
+if test "${enable_cfftot1+set}" = set; then :
   enableval=$enable_cfftot1;
 fi
 # Check whether --enable-mmafm was given.
-if test "${enable_mmafm+set}" = set; then
+if test "${enable_mmafm+set}" = set; then :
   enableval=$enable_mmafm;
 fi
 # Check whether --enable-mmpfb was given.
-if test "${enable_mmpfb+set}" = set; then
+if test "${enable_mmpfb+set}" = set; then :
   enableval=$enable_mmpfb;
 fi
 # Check whether --enable-otfinfo was given.
-if test "${enable_otfinfo+set}" = set; then
+if test "${enable_otfinfo+set}" = set; then :
   enableval=$enable_otfinfo;
 fi
 # Check whether --enable-otftotfm was given.
-if test "${enable_otftotfm+set}" = set; then
+if test "${enable_otftotfm+set}" = set; then :
   enableval=$enable_otftotfm;
 fi
 # Check whether --enable-t1dotlessj was given.
-if test "${enable_t1dotlessj+set}" = set; then
+if test "${enable_t1dotlessj+set}" = set; then :
   enableval=$enable_t1dotlessj;
 fi
 # Check whether --enable-t1lint was given.
-if test "${enable_t1lint+set}" = set; then
+if test "${enable_t1lint+set}" = set; then :
   enableval=$enable_t1lint;
 fi
 # Check whether --enable-t1rawafm was given.
-if test "${enable_t1rawafm+set}" = set; then
+if test "${enable_t1rawafm+set}" = set; then :
   enableval=$enable_t1rawafm;
 fi
 # Check whether --enable-t1reencode was given.
-if test "${enable_t1reencode+set}" = set; then
+if test "${enable_t1reencode+set}" = set; then :
   enableval=$enable_t1reencode;
 fi
 # Check whether --enable-t1testpage was given.
-if test "${enable_t1testpage+set}" = set; then
+if test "${enable_t1testpage+set}" = set; then :
   enableval=$enable_t1testpage;
 fi
 # Check whether --enable-ttftotype42 was given.
-if test "${enable_ttftotype42+set}" = set; then
+if test "${enable_ttftotype42+set}" = set; then :
   enableval=$enable_ttftotype42;
 fi
 
 # Check whether --enable-cfftot1 was given.
-if test "${enable_cfftot1+set}" = set; then
+if test "${enable_cfftot1+set}" = set; then :
   enableval=$enable_cfftot1;
 fi
 # Check whether --enable-t1dotlessj was given.
-if test "${enable_t1dotlessj+set}" = set; then
+if test "${enable_t1dotlessj+set}" = set; then :
   enableval=$enable_t1dotlessj;
 fi
 # Check whether --enable-updmap was given.
-if test "${enable_updmap+set}" = set; then
+if test "${enable_updmap+set}" = set; then :
   enableval=$enable_updmap;
 fi
 
@@ -2984,13 +2920,13 @@ fi
 ## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/
 ## configure options and TL libraries required for makeindexk
 # Check whether --enable-makeindexk was given.
-if test "${enable_makeindexk+set}" = set; then
+if test "${enable_makeindexk+set}" = set; then :
   enableval=$enable_makeindexk;
 fi
 case $enable_makeindexk in #(
   yes|no);; #(
   *) enable_makeindexk=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
 $as_echo "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'";;
 esac
@@ -3003,13 +2939,13 @@ test "x$enable_makeindexk" = xno || {
 ## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/
 ## configure options and TL libraries required for musixflx
 # Check whether --enable-musixflx was given.
-if test "${enable_musixflx+set}" = set; then
+if test "${enable_musixflx+set}" = set; then :
   enableval=$enable_musixflx;
 fi
 case $enable_musixflx in #(
   yes|no);; #(
   *) enable_musixflx=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx=$enable_musixflx'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixflx=$enable_musixflx'" >&5
 $as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-musixflx=$enable_musixflx'";;
 esac
@@ -3018,13 +2954,13 @@ esac
 ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
 ## configure options and TL libraries required for ps2pkm
 # Check whether --enable-ps2pkm was given.
-if test "${enable_ps2pkm+set}" = set; then
+if test "${enable_ps2pkm+set}" = set; then :
   enableval=$enable_ps2pkm;
 fi
 case $enable_ps2pkm in #(
   yes|no);; #(
   *) enable_ps2pkm=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
 $as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'";;
 esac
@@ -3037,13 +2973,13 @@ test "x$enable_ps2pkm" = xno || {
 ## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
 ## configure options and TL libraries required for seetexk
 # Check whether --enable-seetexk was given.
-if test "${enable_seetexk+set}" = set; then
+if test "${enable_seetexk+set}" = set; then :
   enableval=$enable_seetexk;
 fi
 case $enable_seetexk in #(
   yes|no);; #(
   *) enable_seetexk=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
 $as_echo "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'";;
 esac
@@ -3056,13 +2992,13 @@ test "x$enable_seetexk" = xno || {
 ## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
 ## configure options and TL libraries required for tex4htk
 # Check whether --enable-tex4htk was given.
-if test "${enable_tex4htk+set}" = set; then
+if test "${enable_tex4htk+set}" = set; then :
   enableval=$enable_tex4htk;
 fi
 case $enable_tex4htk in #(
   yes|no);; #(
   *) enable_tex4htk=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
 $as_echo "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'";;
 esac
@@ -3075,13 +3011,13 @@ test "x$enable_tex4htk" = xno || {
 ## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/
 ## configure options and TL libraries required for ttf2pk
 # Check whether --enable-ttf2pk was given.
-if test "${enable_ttf2pk+set}" = set; then
+if test "${enable_ttf2pk+set}" = set; then :
   enableval=$enable_ttf2pk;
 fi
 case $enable_ttf2pk in #(
   yes|no);; #(
   *) enable_ttf2pk=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&5
 $as_echo "$as_me: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-ttf2pk=$enable_ttf2pk'";;
 esac
@@ -3095,32 +3031,28 @@ test "x$enable_ttf2pk" = xno || {
 ## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
 ## configure options and TL libraries required for ttfdump
 # Check whether --enable-ttfdump was given.
-if test "${enable_ttfdump+set}" = set; then
+if test "${enable_ttfdump+set}" = set; then :
   enableval=$enable_ttfdump;
 fi
 case $enable_ttfdump in #(
   yes|no);; #(
   *) enable_ttfdump=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
 $as_echo "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'";;
 esac
 
-test "x$enable_ttfdump" = xno || {
-  need_kpathsea=yes
-}
-
 
 ## texk/xdv2pdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdv2pdf/
 ## configure options and TL libraries required for xdv2pdf
 # Check whether --enable-xdv2pdf was given.
-if test "${enable_xdv2pdf+set}" = set; then
+if test "${enable_xdv2pdf+set}" = set; then :
   enableval=$enable_xdv2pdf;
 fi
 case $enable_xdv2pdf in #(
   yes|no);; #(
   *) enable_xdv2pdf=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&5
 $as_echo "$as_me: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xdv2pdf=$enable_xdv2pdf'";;
 esac
@@ -3132,27 +3064,27 @@ test "x$enable_xdv2pdf" = xno || {
 
 ## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
 ## configure options and TL libraries required for xdvik
-if test "x$with_x" = xno; then
-  case $enable_xdvik in
-  "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-xdvik'" >&5
+if test "x$with_x" = xno; then :
+  case $enable_xdvik in #(
+  "") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: \`--without-x' -> \`--disable-xdvik'" >&5
 $as_echo "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;}
                       enable_xdvik=no
-                      ac_configure_args="$ac_configure_args '--disable-xdvik'" ;;
-  yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&5
-$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&2;}
-   { (exit 1); exit 1; }; } ;;
+                      ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; #(
+  yes) :
+    as_fn_error "Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" "$LINENO" 5 ;; #(
+  *) :
+     ;;
 esac
-
 fi
-
 # Check whether --enable-xdvik was given.
-if test "${enable_xdvik+set}" = set; then
+if test "${enable_xdvik+set}" = set; then :
   enableval=$enable_xdvik;
 fi
 case $enable_xdvik in #(
   yes|no);; #(
   *) enable_xdvik=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
 $as_echo "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'";;
 esac
@@ -3166,7 +3098,7 @@ test "x$enable_xdvik" = xno || {
 ## configure options for xdvik
 
 # Check whether --with-xdvi-x-toolkit was given.
-if test "${with_xdvi_x_toolkit+set}" = set; then
+if test "${with_xdvi_x_toolkit+set}" = set; then :
   withval=$with_xdvi_x_toolkit;
 fi
 
@@ -3175,13 +3107,13 @@ fi
 ## texk/xdvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvipdfmx/
 ## configure options and TL libraries required for xdvipdfmx
 # Check whether --enable-xdvipdfmx was given.
-if test "${enable_xdvipdfmx+set}" = set; then
+if test "${enable_xdvipdfmx+set}" = set; then :
   enableval=$enable_xdvipdfmx;
 fi
 case $enable_xdvipdfmx in #(
   yes|no);; #(
   *) enable_xdvipdfmx=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&5
 $as_echo "$as_me: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xdvipdfmx=$enable_xdvipdfmx'";;
 esac
@@ -3196,13 +3128,13 @@ test "x$enable_xdvipdfmx" = xno || {
 ## texk/tetex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tetex/
 ## configure options and TL libraries required for tetex
 # Check whether --enable-tetex was given.
-if test "${enable_tetex+set}" = set; then
+if test "${enable_tetex+set}" = set; then :
   enableval=$enable_tetex;
 fi
 case $enable_tetex in #(
   yes|no);; #(
   *) enable_tetex=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tetex=$enable_tetex'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-tetex=$enable_tetex'" >&5
 $as_echo "$as_me: Assuming \`--enable-tetex=$enable_tetex'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-tetex=$enable_tetex'";;
 esac
@@ -3211,13 +3143,13 @@ esac
 ## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
 ## configure options and TL libraries required for texlive
 # Check whether --enable-texlive was given.
-if test "${enable_texlive+set}" = set; then
+if test "${enable_texlive+set}" = set; then :
   enableval=$enable_texlive;
 fi
 case $enable_texlive in #(
   yes|no);; #(
   *) enable_texlive=$enable_all_pkgs
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-texlive=$enable_texlive'" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-texlive=$enable_texlive'" >&5
 $as_echo "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-texlive=$enable_texlive'";;
 esac
@@ -3228,26 +3160,26 @@ esac
 ## configure options and TL libraries required for kpathsea
 
 # Check whether --with-system-kpathsea was given.
-if test "${with_system_kpathsea+set}" = set; then
+if test "${with_system_kpathsea+set}" = set; then :
   withval=$with_system_kpathsea;
 fi
 
 # Check whether --with-kpathsea-includes was given.
-if test "${with_kpathsea_includes+set}" = set; then
+if test "${with_kpathsea_includes+set}" = set; then :
   withval=$with_kpathsea_includes;
 fi
 
 # Check whether --with-kpathsea-libdir was given.
-if test "${with_kpathsea_libdir+set}" = set; then
+if test "${with_kpathsea_libdir+set}" = set; then :
   withval=$with_kpathsea_libdir;
 fi
 if test "x$with_system_kpathsea" = x; then
   if test -f $srcdir/../texk/kpathsea/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`kpathsea' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`kpathsea' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`kpathsea' headers and library from TL tree" >&6;}
     with_system_kpathsea=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`kpathsea' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`kpathsea' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
     with_system_kpathsea=yes
   fi
@@ -3258,91 +3190,122 @@ fi
 ## subdirectory texk/kpathsea.
 ## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
-if test "${enable_mktexmf_default+set}" = set; then
+if test "${enable_mktexmf_default+set}" = set; then :
   enableval=$enable_mktexmf_default;
 fi
-case $enable_mktexmf_default in
-  yes|no) : ;;
-  *) enable_mktexmf_default=yes ;;
+case $enable_mktexmf_default in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_mktexmf_default=yes ;;
 esac
 # Check whether --enable-mktexpk-default was given.
-if test "${enable_mktexpk_default+set}" = set; then
+if test "${enable_mktexpk_default+set}" = set; then :
   enableval=$enable_mktexpk_default;
 fi
-case $enable_mktexpk_default in
-  yes|no) : ;;
-  *) enable_mktexpk_default=yes ;;
+case $enable_mktexpk_default in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_mktexpk_default=yes ;;
 esac
 # Check whether --enable-mktextfm-default was given.
-if test "${enable_mktextfm_default+set}" = set; then
+if test "${enable_mktextfm_default+set}" = set; then :
   enableval=$enable_mktextfm_default;
 fi
-case $enable_mktextfm_default in
-  yes|no) : ;;
-  *) enable_mktextfm_default=yes ;;
+case $enable_mktextfm_default in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_mktextfm_default=yes ;;
 esac
 # Check whether --enable-mkocp-default was given.
-if test "${enable_mkocp_default+set}" = set; then
+if test "${enable_mkocp_default+set}" = set; then :
   enableval=$enable_mkocp_default;
 fi
-case $enable_mkocp_default in
-  yes|no) : ;;
-  *) enable_mkocp_default=yes ;;
+case $enable_mkocp_default in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_mkocp_default=yes ;;
 esac
 # Check whether --enable-mkofm-default was given.
-if test "${enable_mkofm_default+set}" = set; then
+if test "${enable_mkofm_default+set}" = set; then :
   enableval=$enable_mkofm_default;
 fi
-case $enable_mkofm_default in
-  yes|no) : ;;
-  *) enable_mkofm_default=yes ;;
+case $enable_mkofm_default in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_mkofm_default=yes ;;
 esac
 # Check whether --enable-mktexfmt-default was given.
-if test "${enable_mktexfmt_default+set}" = set; then
+if test "${enable_mktexfmt_default+set}" = set; then :
   enableval=$enable_mktexfmt_default;
 fi
-case $enable_mktexfmt_default in
-  yes|no) : ;;
-  *) enable_mktexfmt_default=yes ;;
+case $enable_mktexfmt_default in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_mktexfmt_default=yes ;;
 esac
 # Check whether --enable-mktextex-default was given.
-if test "${enable_mktextex_default+set}" = set; then
+if test "${enable_mktextex_default+set}" = set; then :
   enableval=$enable_mktextex_default;
 fi
-case $enable_mktextex_default in
-  yes|no) : ;;
-  *) enable_mktextex_default=no ;;
+case $enable_mktextex_default in #(
+  yes|no) :
+     ;; #(
+  *) :
+    enable_mktextex_default=no ;;
 esac
 
 
 ## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
 ## configure options and TL libraries required for icu (modified for XeTeX)
 
+# Check whether --with-system-icu was given.
+if test "${with_system_icu+set}" = set; then :
+  withval=$with_system_icu;
+fi
+if test "x$with_system_icu" = x; then
+  if test -f $srcdir/../libs/icu/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`icu' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`icu' headers and library from TL tree" >&6;}
+    with_system_icu=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`icu' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`icu' headers and library" >&6;}
+    with_system_icu=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-icu=$with_system_icu'"
+fi
+
 
 ## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
 ## configure options and TL libraries required for teckit
 
 # Check whether --with-system-teckit was given.
-if test "${with_system_teckit+set}" = set; then
+if test "${with_system_teckit+set}" = set; then :
   withval=$with_system_teckit;
 fi
 
 # Check whether --with-teckit-includes was given.
-if test "${with_teckit_includes+set}" = set; then
+if test "${with_teckit_includes+set}" = set; then :
   withval=$with_teckit_includes;
 fi
 
 # Check whether --with-teckit-libdir was given.
-if test "${with_teckit_libdir+set}" = set; then
+if test "${with_teckit_libdir+set}" = set; then :
   withval=$with_teckit_libdir;
 fi
 if test "x$with_system_teckit" = x; then
   if test -f $srcdir/../libs/teckit/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`teckit' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`teckit' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`teckit' headers and library from TL tree" >&6;}
     with_system_teckit=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`teckit' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`teckit' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`teckit' headers and library" >&6;}
     with_system_teckit=yes
   fi
@@ -3350,14 +3313,12 @@ $as_echo "$as_me: Assuming installed \`teckit' headers and library" >&6;}
 fi
 if test "x$with_system_teckit" = xyes; then
   if test "x$with_system_zlib" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`zlib' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
 $as_echo "$as_me:   ->  installed \`zlib' headers and library" >&6;}
     with_system_zlib=yes
     ac_configure_args="$ac_configure_args '--with-system-zlib'"
   elif test "x$with_system_zlib" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
   fi
 fi
 
@@ -3370,7 +3331,7 @@ test "x$need_teckit" = xyes && {
 ## XeTeX can be built without graphite support
 
 # Check whether --with-graphite was given.
-if test "${with_graphite+set}" = set; then
+if test "${with_graphite+set}" = set; then :
   withval=$with_graphite;
 fi
 
@@ -3378,26 +3339,16 @@ test "x$with_graphite" = xno && need_graphite=no
 ## configure options and TL libraries required for graphite
 
 # Check whether --with-system-graphite was given.
-if test "${with_system_graphite+set}" = set; then
+if test "${with_system_graphite+set}" = set; then :
   withval=$with_system_graphite;
 fi
-
-# Check whether --with-graphite-includes was given.
-if test "${with_graphite_includes+set}" = set; then
-  withval=$with_graphite_includes;
-fi
-
-# Check whether --with-graphite-libdir was given.
-if test "${with_graphite_libdir+set}" = set; then
-  withval=$with_graphite_libdir;
-fi
 if test "x$with_system_graphite" = x; then
   if test -f $srcdir/../libs/graphite/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`graphite' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`graphite' headers and library from TL tree" >&6;}
     with_system_graphite=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`graphite' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`graphite' headers and library" >&6;}
     with_system_graphite=yes
   fi
@@ -3409,16 +3360,16 @@ fi
 ## configure options and TL libraries required for xpdf
 
 # Check whether --with-system-xpdf was given.
-if test "${with_system_xpdf+set}" = set; then
+if test "${with_system_xpdf+set}" = set; then :
   withval=$with_system_xpdf;
 fi
 if test "x$with_system_xpdf" = x; then
   if test -f $srcdir/../libs/xpdf/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`xpdf' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`xpdf' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;}
     with_system_xpdf=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`xpdf' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`xpdf' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
     with_system_xpdf=yes
   fi
@@ -3430,26 +3381,26 @@ fi
 ## configure options and TL libraries required for gd
 
 # Check whether --with-system-gd was given.
-if test "${with_system_gd+set}" = set; then
+if test "${with_system_gd+set}" = set; then :
   withval=$with_system_gd;
 fi
 
 # Check whether --with-gd-includes was given.
-if test "${with_gd_includes+set}" = set; then
+if test "${with_gd_includes+set}" = set; then :
   withval=$with_gd_includes;
 fi
 
 # Check whether --with-gd-libdir was given.
-if test "${with_gd_libdir+set}" = set; then
+if test "${with_gd_libdir+set}" = set; then :
   withval=$with_gd_libdir;
 fi
 if test "x$with_system_gd" = x; then
   if test -f $srcdir/../libs/gd/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`gd' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gd' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`gd' headers and library from TL tree" >&6;}
     with_system_gd=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`gd' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gd' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`gd' headers and library" >&6;}
     with_system_gd=yes
   fi
@@ -3457,24 +3408,20 @@ $as_echo "$as_me: Assuming installed \`gd' headers and library" >&6;}
 fi
 if test "x$with_system_gd" = xyes; then
   if test "x$with_system_libpng" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`libpng' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`libpng' headers and library" >&5
 $as_echo "$as_me:   ->  installed \`libpng' headers and library" >&6;}
     with_system_libpng=yes
     ac_configure_args="$ac_configure_args '--with-system-libpng'"
   elif test "x$with_system_libpng" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-gd' requires \`--with-system-libpng'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-libpng'" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Sorry, \`--with-system-gd' requires \`--with-system-libpng'" "$LINENO" 5
   fi
   if test "x$with_system_freetype2" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`freetype2' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
 $as_echo "$as_me:   ->  installed \`freetype2' headers and library" >&6;}
     with_system_freetype2=yes
     ac_configure_args="$ac_configure_args '--with-system-freetype2'"
   elif test "x$with_system_freetype2" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Sorry, \`--with-system-gd' requires \`--with-system-freetype2'" "$LINENO" 5
   fi
 fi
 
@@ -3487,16 +3434,16 @@ test "x$need_gd" = xyes && {
 ## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
 
 # Check whether --with-system-freetype2 was given.
-if test "${with_system_freetype2+set}" = set; then
+if test "${with_system_freetype2+set}" = set; then :
   withval=$with_system_freetype2;
 fi
 if test "x$with_system_freetype2" = x; then
   if test -f $srcdir/../libs/freetype2/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`freetype2' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype2' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`freetype2' headers and library from TL tree" >&6;}
     with_system_freetype2=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`freetype2' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype2' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
     with_system_freetype2=yes
   fi
@@ -3504,14 +3451,12 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
 fi
 if test "x$with_system_freetype2" = xyes; then
   if test "x$with_system_zlib" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`zlib' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
 $as_echo "$as_me:   ->  installed \`zlib' headers and library" >&6;}
     with_system_zlib=yes
     ac_configure_args="$ac_configure_args '--with-system-zlib'"
   elif test "x$with_system_zlib" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" "$LINENO" 5
   fi
 fi
 
@@ -3524,26 +3469,26 @@ test "x$need_freetype2" = xyes && {
 ## configure options and TL libraries required for freetype
 
 # Check whether --with-system-freetype was given.
-if test "${with_system_freetype+set}" = set; then
+if test "${with_system_freetype+set}" = set; then :
   withval=$with_system_freetype;
 fi
 
 # Check whether --with-freetype-includes was given.
-if test "${with_freetype_includes+set}" = set; then
+if test "${with_freetype_includes+set}" = set; then :
   withval=$with_freetype_includes;
 fi
 
 # Check whether --with-freetype-libdir was given.
-if test "${with_freetype_libdir+set}" = set; then
+if test "${with_freetype_libdir+set}" = set; then :
   withval=$with_freetype_libdir;
 fi
 if test "x$with_system_freetype" = x; then
   if test -f $srcdir/../libs/freetype/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`freetype' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`freetype' headers and library from TL tree" >&6;}
     with_system_freetype=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`freetype' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;}
     with_system_freetype=yes
   fi
@@ -3555,26 +3500,26 @@ fi
 ## configure options and TL libraries required for t1lib
 
 # Check whether --with-system-t1lib was given.
-if test "${with_system_t1lib+set}" = set; then
+if test "${with_system_t1lib+set}" = set; then :
   withval=$with_system_t1lib;
 fi
 
 # Check whether --with-t1lib-includes was given.
-if test "${with_t1lib_includes+set}" = set; then
+if test "${with_t1lib_includes+set}" = set; then :
   withval=$with_t1lib_includes;
 fi
 
 # Check whether --with-t1lib-libdir was given.
-if test "${with_t1lib_libdir+set}" = set; then
+if test "${with_t1lib_libdir+set}" = set; then :
   withval=$with_t1lib_libdir;
 fi
 if test "x$with_system_t1lib" = x; then
   if test -f $srcdir/../libs/t1lib/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`t1lib' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`t1lib' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`t1lib' headers and library from TL tree" >&6;}
     with_system_t1lib=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`t1lib' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`t1lib' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`t1lib' headers and library" >&6;}
     with_system_t1lib=yes
   fi
@@ -3590,26 +3535,26 @@ fi
 ## configure options and TL libraries required for libpng
 
 # Check whether --with-system-libpng was given.
-if test "${with_system_libpng+set}" = set; then
+if test "${with_system_libpng+set}" = set; then :
   withval=$with_system_libpng;
 fi
 
 # Check whether --with-libpng-includes was given.
-if test "${with_libpng_includes+set}" = set; then
+if test "${with_libpng_includes+set}" = set; then :
   withval=$with_libpng_includes;
 fi
 
 # Check whether --with-libpng-libdir was given.
-if test "${with_libpng_libdir+set}" = set; then
+if test "${with_libpng_libdir+set}" = set; then :
   withval=$with_libpng_libdir;
 fi
 if test "x$with_system_libpng" = x; then
   if test -f $srcdir/../libs/libpng/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`libpng' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpng' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`libpng' headers and library from TL tree" >&6;}
     with_system_libpng=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`libpng' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpng' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`libpng' headers and library" >&6;}
     with_system_libpng=yes
   fi
@@ -3617,14 +3562,12 @@ $as_echo "$as_me: Assuming installed \`libpng' headers and library" >&6;}
 fi
 if test "x$with_system_libpng" = xyes; then
   if test "x$with_system_zlib" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`zlib' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`zlib' headers and library" >&5
 $as_echo "$as_me:   ->  installed \`zlib' headers and library" >&6;}
     with_system_zlib=yes
     ac_configure_args="$ac_configure_args '--with-system-zlib'"
   elif test "x$with_system_zlib" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-libpng' requires \`--with-system-zlib'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-libpng' requires \`--with-system-zlib'" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Sorry, \`--with-system-libpng' requires \`--with-system-zlib'" "$LINENO" 5
   fi
 fi
 
@@ -3637,26 +3580,26 @@ test "x$need_libpng" = xyes && {
 ## configure options and TL libraries required for zlib
 
 # Check whether --with-system-zlib was given.
-if test "${with_system_zlib+set}" = set; then
+if test "${with_system_zlib+set}" = set; then :
   withval=$with_system_zlib;
 fi
 
 # Check whether --with-zlib-includes was given.
-if test "${with_zlib_includes+set}" = set; then
+if test "${with_zlib_includes+set}" = set; then :
   withval=$with_zlib_includes;
 fi
 
 # Check whether --with-zlib-libdir was given.
-if test "${with_zlib_libdir+set}" = set; then
+if test "${with_zlib_libdir+set}" = set; then :
   withval=$with_zlib_libdir;
 fi
 if test "x$with_system_zlib" = x; then
   if test -f $srcdir/../libs/zlib/configure; then
-    { $as_echo "$as_me:$LINENO: Assuming \`zlib' headers and library from TL tree" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`zlib' headers and library from TL tree" >&5
 $as_echo "$as_me: Assuming \`zlib' headers and library from TL tree" >&6;}
     with_system_zlib=no
   else
-    { $as_echo "$as_me:$LINENO: Assuming installed \`zlib' headers and library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`zlib' headers and library" >&5
 $as_echo "$as_me: Assuming installed \`zlib' headers and library" >&6;}
     with_system_zlib=yes
   fi
@@ -3683,10 +3626,10 @@ am__api_version='1.11'
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$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
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3694,11 +3637,11 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -3735,7 +3678,7 @@ case $as_dir/ in
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -3751,7 +3694,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3762,7 +3705,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
@@ -3773,15 +3716,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -3803,11 +3742,8 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
    fi
 
    test "$2" = conftest.file
@@ -3816,13 +3752,10 @@ then
    # Ok.
    :
 else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -3850,7 +3783,7 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
@@ -3871,9 +3804,9 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -3884,24 +3817,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; 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_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3911,9 +3844,9 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -3924,24 +3857,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; 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_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3950,7 +3883,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3963,10 +3896,10 @@ fi
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3974,7 +3907,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
+    for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -3986,7 +3919,7 @@ do
 	   esac
 	 done
        done
-done
+  done
 IFS=$as_save_IFS
 
 fi
@@ -4002,7 +3935,7 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -4015,9 +3948,9 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -4028,24 +3961,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; 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_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4053,11 +3986,11 @@ fi
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$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
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -4075,11 +4008,11 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -4099,9 +4032,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -4158,16 +4089,16 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:${as_lineno-$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
+if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -4181,59 +4112,15 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
 
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
 
-
-
-
-subdirs="$subdirs dummy"
-
-
-{ $as_echo "$as_me:$LINENO: checking for TeXk programs to build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeXk programs to build" >&5
 $as_echo_n "checking for TeXk programs to build... " >&6; }
 SUBTEXK=
 DIST_SUBTEXK=
 
+
+
 if test -x $srcdir/web2c/configure; then
   test "x$enable_web2c" = xno || SUBTEXK="$SUBTEXK web2c"
   DIST_SUBTEXK="$DIST_SUBTEXK web2c"
@@ -4264,6 +4151,16 @@ if test -x $srcdir/bibtex8/configure; then
 fi
 
 
+if test -x $srcdir/bibtexu/configure; then
+  test "x$enable_bibtexu" = xno || SUBTEXK="$SUBTEXK bibtexu"
+  DIST_SUBTEXK="$DIST_SUBTEXK bibtexu"
+  if false; then
+    subdirs="$subdirs bibtexu"
+
+  fi
+fi
+
+
 if test -x $srcdir/cjkutils/configure; then
   test "x$enable_cjkutils" = xno || SUBTEXK="$SUBTEXK cjkutils"
   DIST_SUBTEXK="$DIST_SUBTEXK cjkutils"
@@ -4526,7 +4423,7 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: result: $SUBTEXK" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUBTEXK" >&5
 $as_echo "$SUBTEXK" >&6; }
 
 ac_config_files="$ac_config_files Makefile"
@@ -4559,13 +4456,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$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 ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -4573,8 +4470,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -4597,11 +4494,11 @@ $as_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" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -4657,8 +4554,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   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"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -4667,20 +4564,18 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -4690,17 +4585,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -4708,23 +4604,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -4732,7 +4620,13 @@ export as_nl
 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
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -4743,7 +4637,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -4766,13 +4660,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -4782,15 +4669,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -4802,12 +4689,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -4819,7 +4710,89 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -4833,8 +4806,12 @@ else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -4854,76 +4831,25 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $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
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -4952,8 +4878,56 @@ fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -4972,10 +4946,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -4990,13 +4964,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by TeX Live texk $as_me 2009, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5023,10 +5003,11 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
@@ -5040,16 +5021,16 @@ Usage: $0 [OPTION]... [FILE]...
 Configuration files:
 $config_files
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <peb@mppmu.mpg.de>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 TeX Live texk config.status 2009
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -5092,7 +5073,7 @@ do
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -5101,11 +5082,10 @@ do
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -5153,9 +5133,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) { { $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; }; };;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -5180,7 +5158,7 @@ $debug ||
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -5191,11 +5169,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -5203,10 +5177,16 @@ $debug ||
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 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'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -5220,24 +5200,18 @@ _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; }; }
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./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; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -5326,9 +5300,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 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; }; }
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -5359,9 +5331,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -5389,12 +5359,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $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; }; };;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -5405,7 +5373,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -5418,9 +5386,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) 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; }; } ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -5448,47 +5414,7 @@ $as_echo X"$ac_file" |
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || 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; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -5545,7 +5471,6 @@ 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=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -5555,12 +5480,11 @@ ac_sed_dataroot='
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$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 || ac_write_fail=1
@@ -5570,7 +5494,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -5599,14 +5523,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 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; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 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"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 $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;}
@@ -5616,9 +5538,7 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   -) 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; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
 
 
@@ -5628,15 +5548,12 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _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; }; }
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -5657,7 +5574,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit $?
 fi
 
 #
@@ -5701,7 +5618,7 @@ if test "$no_recursion" != yes; then
       case $ac_arg in
       *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
-      ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
+      as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
     esac
   done
 
@@ -5730,49 +5647,9 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    $as_echo "$as_me:$LINENO: $ac_msg" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
     $as_echo "$ac_msg" >&6
-    { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || 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; }; }; }
+    as_dir="$ac_dir"; as_fn_mkdir_p
     ac_builddir=.
 
 case "$ac_dir" in
@@ -5819,7 +5696,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       # This should be Cygnus configure.
       ac_sub_configure=$ac_aux_dir/configure
     else
-      { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+      { $as_echo "$as_me:${as_lineno-$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
@@ -5833,21 +5710,19 @@ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { $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:${as_lineno-$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\"" ||
-	{ { $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; }; }
+	as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     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:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi