dvipdfmx-20071115

git-svn-id: svn://tug.org/texlive/trunk@7557 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2008-04-21 00:43:12 +0000
committer: Karl Berry <karl@freefriends.org> 2008-04-21 00:43:12 +0000
commit: 522864734c14c14e4271f25fc2930a0a98285f71 (patch)
tree: aed654dbf1ae6e72828140d796cf6d3556c439f9 /Build
parent: c45aea54ea6e47ebd46f0a0025acfd0b9b2b9311 (diff)
67 files changed, 5252 insertions, 3429 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index f4062ccfc10..23d1e1376d6 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -40,9 +40,10 @@ dviljk - Joachim Schrod
 dvipdfm - now moribund, but until dvipdfmx is a 100% replacement we
   cannot drop it.
 
-dvipdfmx 20061211 - ok 14dec06
+dvipdfmx 20070518 - ok 21apr08
   http://project.ktug.or.kr/dvipdfmx/snapshot/current/
   -> http://www.ctan.org/tex-archive/dviware/dvipdfmx/
+  dvipdfmx@project.ktug.or.kr (ChoF, Hirata, Matthias)
 
 dvipng 1.9 - ok 5dec06
   http://www.ctan.org/tex-archive/dviware/dvipng/
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 33728018c1f..9bded5ff81b 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,22 +1,190 @@
-$Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.141 2006/12/11 13:01:38 chofchof Exp $
+$Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.162 2007/11/15 17:08:52 chofchof Exp $
 
-ChangeLog: Changes for dvipdfmx (teTeX / TeX live)
-==================================================
+ChangeLog: Changes for dvipdfmx
+===============================
 
-2008-04-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
-	* configure.in: respect library dependencies.
+2007-11-15  Jin-Hwan Cho <chofchof@ktug.or.kr>
 
-2008-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+        * cid_basefont.h:
+          Add a predefined simplified Chinese font, AdobeHeitiStd-Regular.otf.
 
-	* Makefile.am: added `ACLOCAL_AMFLAGS -I m4'
-	* configure.in: moved macro definitions ...
-	* m4/maw-time.m4 (new): ... to here
-	* acinclude.m4 (removed): moved macro definitions ...
-	* m4/maw-kpse.m4, maw-libs.m4 (both new): ... to here; these
-	files are the same as in ../xdvipdfmx.
+        * pdffont.c:
+          Fixed a bug causing problems with Type0 fonts;
+          reported by Akira Kakuto.
 
-ChangeLog: Changes for dvipdfmx
-===============================
+2007-11-13  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * dpxutil.c, dpxutil.h, dvipdfmx.c, mem.c, mem.h, fontmap.c, pdfdoc.c, pdfdoc.h, pdfobj.c, pdfobj.h, subfont.c, subfont.h, vf.c, dpxfile.c, xbb.c:
+          Applied the memory leak patch by Matthias Franz.
+
+        * pdfencoding.c, pdfencoding.h, pdffont.c, type1.c, type1c.c, truetype.c, pkfont.c:
+          Applied the encoding patch by Matthias Franz.
+
+        * agl.c, agl.h:
+          Introduced new predefined glyphlist.txt; contributed by
+          Matthias Franz.
+
+2007-11-03  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * mpost.c:
+          Fixed a bug in skip_prolog(), which is unable to skip prolog.
+          Now work with "prologues:=3" mode in metapost 1.000.
+
+2007-07-03  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * cff_dict.c:
+          Fixed a bug in pack_real() using work_buffer twice;
+          found by Takanori Uchiyama and reported by Akira Kakuto.
+
+2007-06-30  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * cidtype0.c, cff_dict.h:
+          Fixed a bug checking cid >= CIDCount, which causes a problem
+          with some CJK otf fonts without having the CIDCount value.
+
+2007-06-28  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * cff_dict.c:
+          Modified pack_real() to support musix20.pfb in Mac OS X 10.4 Quartz.
+          It seems that Mac OS X 10.4 Quartz has a bug on reading real numbers
+          in CFF font format. Since Mac OS X 10.4.10 the problem was solved.
+
+2007-05-18  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * jpegimage.c, pngimage.c, pdfximage.c, pdfximage.h, dvipdfmx.c, xbb.c:
+          Updated "xbb" to generate ".xbb" not ".bb". There is a big
+          difference between "xbb" and "ebb" in handling bitmap images.
+          In the case of bitmap images not having density information,
+          there is no way to know the density (or DPI) of the image.
+          "ebb" always assume that the image has 100 DPI so that
+          100 pixels = 1 in = 72 bp. However, in this case, screen
+          capture image does not look clear. Thus, "xbb" follows pdfTeX,
+          which uses density information if exists, otherwise 72 DPI,
+          i.e., 72 pixels = 1 in = 72 bp, is used. With the modified
+          "dvipdfmx.def" driver for the LaTeX graphics package, you can
+          get the same result as pdfTeX.
+
+2007-05-04  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * xbb.c:
+          New program "xbb" extending "ebb".
+
+2007-05-03  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * pdfximage.c, pdfximage.h, dvipdfmx.c:
+          Support bbox for "pdf:image" special (experimental).
+          The program "ebb" extracting the bounding box of image files
+          always multiply 72/100 for bitmap images (png and jpg).
+          It causes some trouble with LaTeX graphicx package which read
+          the bounding box from ".bb" file usually generated by "ebb".
+          New experimantal option "-C 0x0020" is introduced. With this
+          option, dvipdfmx no longer multiply 72/100 for bitmap images
+          so that users can get the same result as pdftex.
+
+2007-04-25  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * spc_pdfm.c:
+          Extended pdf:outline special to support open/close bookmark.
+          The previous version 20070409 had problem because toclevel
+          of part is -1 in some class files.
+
+2007-04-24  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * spc_util.c:
+          Predefined colors, Black, White, and Gray caused some problem
+          in Adobe Reader 7 and 8; but not in other PDF viewers, e.g.,
+          Previewer.app. It was solved by changing cmyk value to gray value.
+
+2007-04-17  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * dvipdfmx.c, pdfobj.c:
+          The default of the PDF minor version was changed from 3 to 4.
+
+        * type1.c:
+          A bug was reported from Werner Lemberg (run nfssfont.tex for
+          the font ptmr8y). It happened when any character is used more
+          than one in one encoding file (e.g., texnansi.enc). To fix it,
+          Encoding resource was revived (but Hirata noted that there was
+          some problem with Ghostscript, not confirmed yet) and Widths
+          resource was changed to look up correct glyphs according to the
+          given encoding.
+
+        * vf.c:
+          Suppress an annoying warning message if no verbose option is given.
+
+2007-04-13  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * tt_cmap.c:
+          Support OpenType with PID=0, EID=3
+
+2007-04-09  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * dvipdfmx.c:
+          Updated the usage as suggested by Matthias Franz
+
+2007-04-03  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * pdfobj.c, pdfdoc.h, pdfencrypt.c, pdfencrypt.h, pdfobj.c, pdfobj.h, pdfparse.c, dvipdfmx.c:
+          Support object stream for PDF v1.5 or higher; contributed by
+          Matthias Franz. Previewer.app in Mac OS X did not work with
+          encryption under v1.5, but no problem with Adobe Reader 8
+
+2007-03-26  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * pdfobj.c:
+          Support xref stream for PDF v1.5 or higher; contributed by Matthias Franz
+
+2007-03-17  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * dpxfile.c:
+          Fixed a bug in reading .enc file; reported by Matthias Franz
+
+
+2007-02-28  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * epdf.c:
+          Fixed a problem in handling Cropbox
+
+2007-02-14  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * cidtype0.c tt_glyf.c tt_table.h, tt_table.c:
+          Fixed a bug in reading htmx and vtmx tables; reported by
+          Jjgod Jiang based on the solution by Jonathan Kew
+
+2007-01-21  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * fontmap.c:
+          Fixed typos found by Jonathan Kew
+
+2007-01-20  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * specials.h:
+          Fixed warning message in the IRIX compilation,
+          reported by Karl Berry and found by Olaf Weber
+
+2007-01-19  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+        * fontmap.c:
+          Fixed a bug reported by Shigeru Miyata on Dec 28, 2005
+
+        * spc_html.c:
+          Fixed a bug reported by Nobuyuki Tsuchimura on Jan 19, 2007
+
+2006-12-20  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+	* configure:
+          Remake using autoconf-2.59
+
+	* configure.in config.h.in src/pdfdoc.c:
+          Apply tm_gmtoff related modifications by Karl Berry
+
+2006-12-15  Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+	* configure aclocal.m4 Makefile.in src/Makefile.in data/Makefile.in:
+          Remake using aclocal-1.6, automake-1.6, and autoconf-2.59
+
+	* configure.in src/Makefile.am data/Makefile.am:
+          Apply configure related modifications by Karl Berry
 
 2006-12-11  Jin-Hwan Cho <chofchof@ktug.or.kr>
 
@@ -39,8 +207,6 @@ ChangeLog: Changes for dvipdfmx
 	* t1_load.c:
           Modified to work with broken fonts, e.g. belleek/blsy.pfb.
 
-2006-12-06  Jin-Hwan Cho <chofchof@ktug.or.kr>
-
 	* dvipdfmx.c, dvi.c, dvi.h:
           Add xoffset and yoffset specials.
 
diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am
index b5f38ebe6b3..c7b1787e9f0 100644
--- a/Build/source/texk/dvipdfmx/Makefile.am
+++ b/Build/source/texk/dvipdfmx/Makefile.am
@@ -1,2 +1,6 @@
 SUBDIRS = data src
 ACLOCAL_AMFLAGS = -I m4
+
+# to regenerate autofiles, run
+#   aclocal -I m4 && autoconf && autoheader && automake
+# tested with autoconf 2.62 and automake 1.10.1.  --karl, 21apr08.
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index 48c1d910529..effbfe0fbf7 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -165,6 +165,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = data src
@@ -606,6 +607,10 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 
+
+# to regenerate autofiles, run
+#   aclocal -I m4 && autoconf && autoheader && automake
+# tested with autoconf 2.62 and automake 1.10.1.  --karl, 21apr08.
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/texk/dvipdfmx/aclocal.m4 b/Build/source/texk/dvipdfmx/aclocal.m4
index 6fbe88e9727..f1323b41fdb 100644
--- a/Build/source/texk/dvipdfmx/aclocal.m4
+++ b/Build/source/texk/dvipdfmx/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
+m4_if(AC_AUTOCONF_VERSION, [2.62],,
+[m4_warning([this file was generated for autoconf 2.62.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/Build/source/texk/dvipdfmx/compile b/Build/source/texk/dvipdfmx/compile
index 1b1d2321695..9bb997a6a9b 100755
--- a/Build/source/texk/dvipdfmx/compile
+++ b/Build/source/texk/dvipdfmx/compile
@@ -1,9 +1,8 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2005-05-14.22
+# Wrapper for compilers which do not understand `-c -o'.
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright 1999, 2000 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,125 +17,83 @@ scriptversion=2005-05-14.22
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
+# Usage:
+# compile PROGRAM [ARGS]...
+# `-o FOO.o' is removed from the args passed to the actual compile.
 
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
+prog=$1
+shift
 
 ofile=
 cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
+args=
+while test $# -gt 0; do
+   case "$1" in
+    -o)
+       # configure might choose to run compile as `compile cc -o foo foo.c'.
+       # So we do something ugly here.
+       ofile=$2
+       shift
+       case "$ofile" in
+	*.o | *.obj)
+	   ;;
+	*)
+	   args="$args -o $ofile"
+	   ofile=
+	   ;;
+       esac
+       ;;
+    *.c)
+       cfile=$1
+       args="$args $1"
+       ;;
+    *)
+       args="$args $1"
+       ;;
+   esac
+   shift
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
+   # If no `-o' option was seen then we might have been invoked from a
+   # pattern rule where we don't need one.  That is ok -- this is a
+   # normal compilation that the losing compiler can handle.  If no
+   # `.c' file was seen then we are probably linking.  That is also
+   # ok.
+   exec "$prog" $args
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
 
 # Create the lock directory.
 # Note: use `[/.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
 while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
+   if mkdir $lockdir > /dev/null 2>&1; then
+      break
+   fi
+   sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
+trap "rmdir $lockdir; exit 1" 1 2 15
 
 # Run the compile.
-"$@"
-ret=$?
+"$prog" $args
+status=$?
 
 if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
+   mv "$cofile" "$ofile"
 fi
 
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
+rmdir $lockdir
+exit $status
diff --git a/Build/source/texk/dvipdfmx/config.h.in b/Build/source/texk/dvipdfmx/config.h.in
index ad2a2a1562d..cbb44524052 100644
--- a/Build/source/texk/dvipdfmx/config.h.in
+++ b/Build/source/texk/dvipdfmx/config.h.in
@@ -132,9 +132,13 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+#elif ! defined __LITTLE_ENDIAN__
+# undef WORDS_BIGENDIAN
+#endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index d98afdb26c5..701c6114da5 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.62.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -63,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -100,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -158,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -413,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -529,10 +551,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -665,6 +687,7 @@ MAKEINFO
 install_sh
 STRIP
 INSTALL_STRIP_PROGRAM
+MKDIR_P
 mkdir_p
 AWK
 SET_MAKE
@@ -707,6 +730,23 @@ LDLIBPNG
 LIBPNGDEP
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+enable_dependency_tracking
+enable_largefile
+enable_tetex_build
+with_kpathsea
+with_system_zlib
+with_zlib_libdir
+with_zlib_include
+with_system_pnglib
+with_pnglib_libdir
+with_pnglib_include
+with_paper
+with_zlib
+with_png
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -721,6 +761,8 @@ CPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -819,13 +861,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -838,13 +888,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1035,22 +1093,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1070,7 +1144,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1079,16 +1153,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1097,22 +1171,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1127,7 +1217,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1143,10 +1233,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1154,12 +1244,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1186,12 +1276,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1240,9 +1330,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1252,25 +1342,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1287,6 +1377,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
@@ -1332,15 +1423,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1376,7 +1469,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1386,10 +1479,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1400,7 +1493,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1436,7 +1529,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1471,7 +1564,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1523,11 +1616,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1557,9 +1651,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1574,9 +1668,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1592,8 +1686,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1635,21 +1729,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1659,16 +1756,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1682,29 +1779,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1714,10 +1820,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1763,8 +1869,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1790,11 +1896,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -1823,17 +1930,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -1846,8 +1965,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1857,8 +1976,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -1881,9 +2000,9 @@ 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".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+$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; }; }
    fi
@@ -1894,26 +2013,23 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1924,15 +2040,15 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+{ $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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -1967,8 +2083,8 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
@@ -1980,10 +2096,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -1996,7 +2112,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2007,22 +2123,23 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2039,12 +2156,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2063,8 +2180,8 @@ 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
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { { $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; }; }
   fi
 fi
@@ -2081,7 +2198,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=dvipdfmx
- VERSION=20061211
+ VERSION=20071115
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2119,10 +2236,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2135,7 +2252,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2146,11 +2263,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2159,10 +2276,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2175,7 +2292,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2186,11 +2303,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2198,10 +2315,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2229,8 +2346,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 ac_config_headers="$ac_config_headers config.h"
 
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -2238,8 +2355,8 @@ else
   USE_MAINTAINER_MODE=no
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
@@ -2260,10 +2377,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2276,7 +2393,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2287,11 +2404,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2300,10 +2417,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2316,7 +2433,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2327,11 +2444,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2339,10 +2456,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2357,10 +2474,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2373,7 +2490,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2384,11 +2501,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2397,10 +2514,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2418,7 +2535,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2441,11 +2558,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2456,10 +2573,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2472,7 +2589,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2483,11 +2600,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2500,10 +2617,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2516,7 +2633,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2527,11 +2644,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2543,10 +2660,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2558,44 +2675,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2614,27 +2735,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2645,10 +2761,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2659,7 +2776,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2686,15 +2803,15 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
@@ -2703,8 +2820,8 @@ ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2713,49 +2830,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2764,31 +2883,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2811,40 +2930,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2870,20 +2990,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2893,15 +3014,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2928,20 +3053,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2966,20 +3092,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3005,20 +3132,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3033,8 +3161,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3050,10 +3178,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3124,20 +3252,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3153,15 +3282,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3182,8 +3311,8 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -3210,8 +3339,8 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
@@ -3235,10 +3364,10 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -3326,8 +3455,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -3342,16 +3471,16 @@ fi
 
 
 if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
-set dummy $CC; ac_cc=`echo $2 |
+set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
 if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3377,19 +3506,21 @@ if { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
    test -f conftest2.$ac_objext && { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); };
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
@@ -3400,10 +3531,11 @@ then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
       rm -f conftest2.*
@@ -3411,19 +3543,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
 	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); };
       then
 	# cc works too.
@@ -3441,11 +3575,11 @@ rm -f core conftest*
 
 fi
 if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define NO_MINUS_C_MINUS_O 1
@@ -3480,11 +3614,12 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3513,17 +3648,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -3536,8 +3683,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3547,22 +3694,23 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -3579,12 +3727,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -3597,10 +3745,10 @@ fi
 
 if test "$enable_largefile" != no; then
 
-  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
@@ -3637,20 +3785,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3664,20 +3813,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3690,16 +3840,16 @@ rm -f core conftest.err conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   while :; do
   cat >conftest.$ac_ext <<_ACEOF
@@ -3731,20 +3881,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_sys_file_offset_bits=no; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3781,20 +3932,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_sys_file_offset_bits=64; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3805,8 +3957,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *)
@@ -3815,12 +3967,12 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ;;
 esac
-rm -f conftest*
+rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
 if test "${ac_cv_sys_large_files+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   while :; do
   cat >conftest.$ac_ext <<_ACEOF
@@ -3852,20 +4004,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_sys_large_files=no; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3902,20 +4055,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_sys_large_files=1; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3926,8 +4080,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *)
@@ -3936,14 +4090,14 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ;;
 esac
-rm -f conftest*
+rm -rf conftest*
   fi
 fi
 
-{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
 if test "${ac_cv_sys_largefile_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   while :; do
   cat >conftest.$ac_ext <<_ACEOF
@@ -3952,11 +4106,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -3967,26 +4123,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_sys_largefile_source=no; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
@@ -3996,11 +4156,13 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -4011,34 +4173,38 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_sys_largefile_source=1; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   ac_cv_sys_largefile_source=unknown
   break
 done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
+$as_echo "$ac_cv_sys_largefile_source" >&6; }
 case $ac_cv_sys_largefile_source in #(
   no | unknown) ;;
   *)
@@ -4047,7 +4213,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ;;
 esac
-rm -f conftest*
+rm -rf conftest*
 
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
@@ -4078,14 +4244,14 @@ if test "x$enable_tetex_build" = xyes; then
 
 
   if test ! -d $srcdir/../../texk/kpathsea; then
-    { { echo "$as_me:$LINENO: error:
+    { { $as_echo "$as_me:$LINENO: error:
 =========================================
 
 You specified --enable-tetex-build, but I can't find the kpathsea
 directory.  I expected it to be in $srcdir/../../texk/kpathsea.
 
 =========================================" >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 =========================================
 
 You specified --enable-tetex-build, but I can't find the kpathsea
@@ -4132,10 +4298,10 @@ else
 fi
 
 
-  { echo "$as_me:$LINENO: checking for kpse_find_file in -lkpathsea" >&5
-echo $ECHO_N "checking for kpse_find_file in -lkpathsea... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for kpse_find_file in -lkpathsea" >&5
+$as_echo_n "checking for kpse_find_file in -lkpathsea... " >&6; }
 if test "${ac_cv_lib_kpathsea_kpse_find_file+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkpathsea  $LIBS"
@@ -4167,41 +4333,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_kpathsea_kpse_find_file=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_kpathsea_kpse_find_file=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_kpathsea_kpse_find_file" >&5
-echo "${ECHO_T}$ac_cv_lib_kpathsea_kpse_find_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kpathsea_kpse_find_file" >&5
+$as_echo "$ac_cv_lib_kpathsea_kpse_find_file" >&6; }
 if test $ac_cv_lib_kpathsea_kpse_find_file = yes; then
   LIBS="-lkpathsea $LIBS"
 else
-  { { echo "$as_me:$LINENO: error: kpathsea library not found
+  { { $as_echo "$as_me:$LINENO: error: kpathsea library not found
 This version of dvipdfmx requires the kpathsea library and its headers. If
 you know where it is you might try setting the LDFLAGS environment variable
 with -L pointing to the directory containing libkpathsea.a.
     " >&5
-echo "$as_me: error: kpathsea library not found
+$as_echo "$as_me: error: kpathsea library not found
 This version of dvipdfmx requires the kpathsea library and its headers. If
 you know where it is you might try setting the LDFLAGS environment variable
 with -L pointing to the directory containing libkpathsea.a.
@@ -4211,8 +4381,8 @@ with -L pointing to the directory containing libkpathsea.a.
 fi
 
 
-    { echo "$as_me:$LINENO: checking whether you have kpathsea headers and they know about the required file formats" >&5
-echo $ECHO_N "checking whether you have kpathsea headers and they know about the required file formats... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether you have kpathsea headers and they know about the required file formats" >&5
+$as_echo_n "checking whether you have kpathsea headers and they know about the required file formats... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4240,24 +4410,25 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-{ echo "$as_me:$LINENO: checking for xbasename in -lkpathsea" >&5
-echo $ECHO_N "checking for xbasename in -lkpathsea... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for xbasename in -lkpathsea" >&5
+$as_echo_n "checking for xbasename in -lkpathsea... " >&6; }
 if test "${ac_cv_lib_kpathsea_xbasename+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkpathsea  $LIBS"
@@ -4289,32 +4460,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_kpathsea_xbasename=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_kpathsea_xbasename=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_kpathsea_xbasename" >&5
-echo "${ECHO_T}$ac_cv_lib_kpathsea_xbasename" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kpathsea_xbasename" >&5
+$as_echo "$ac_cv_lib_kpathsea_xbasename" >&6; }
 if test $ac_cv_lib_kpathsea_xbasename = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKPATHSEA 1
@@ -4323,23 +4498,23 @@ _ACEOF
   LIBS="-lkpathsea $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename() in kpathsea library." >&5
-echo "$as_me: error: This version of dvipdfmx requires xbasename() in kpathsea library." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename() in kpathsea library." >&5
+$as_echo "$as_me: error: This version of dvipdfmx requires xbasename() in kpathsea library." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-   { { echo "$as_me:$LINENO: error: This version of dvipdfmx requires that kpathsea and its headers be installed.
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+   { { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires that kpathsea and its headers be installed.
 If you are sure they are installed and in a standard place, maybe you need a
 newer version of kpathsea?  You also might try setting the environment
 variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing
 the file \"tex-file.h\"" >&5
-echo "$as_me: error: This version of dvipdfmx requires that kpathsea and its headers be installed.
+$as_echo "$as_me: error: This version of dvipdfmx requires that kpathsea and its headers be installed.
 If you are sure they are installed and in a standard place, maybe you need a
 newer version of kpathsea?  You also might try setting the environment
 variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing
@@ -4350,8 +4525,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-    { echo "$as_me:$LINENO: checking whether kpathsea library supports TDS version 1.1 installation" >&5
-echo $ECHO_N "checking whether kpathsea library supports TDS version 1.1 installation... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether kpathsea library supports TDS version 1.1 installation" >&5
+$as_echo_n "checking whether kpathsea library supports TDS version 1.1 installation... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4378,19 +4553,20 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define __TDS_VERSION__ 0x200406L
@@ -4405,11 +4581,11 @@ else
 fi
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define __TDS_VERSION__ 0x200302L
@@ -4435,15 +4611,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4475,20 +4651,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4512,13 +4689,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4526,7 +4704,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4551,8 +4729,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4580,20 +4758,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4617,13 +4796,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4631,7 +4811,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4647,9 +4827,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4661,42 +4841,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4711,74 +4886,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4793,40 +4954,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4853,20 +5005,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4958,37 +5111,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5010,11 +5166,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5032,20 +5188,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -5053,12 +5210,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5069,20 +5228,21 @@ done
 
 for ac_header in unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5098,32 +5258,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5137,69 +5298,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5211,20 +5375,21 @@ done
 
 for ac_header in stdint.h inttypes.h sys/types.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5240,32 +5405,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5279,69 +5445,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5349,10 +5518,10 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
+$as_echo_n "checking for working memcmp... " >&6; }
 if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_memcmp_working=no
@@ -5402,36 +5571,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_memcmp_working=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_func_memcmp_working=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
 test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
   *" memcmp.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
@@ -5447,11 +5619,11 @@ esac
 
 for ac_func in open close system getenv mkstemp basename
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5504,43 +5676,49 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-{ echo "$as_me:$LINENO: checking whether time.h defines timezone as an external variable" >&5
-echo $ECHO_N "checking whether time.h defines timezone as an external variable... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether time.h defines timezone as an external variable" >&5
+$as_echo_n "checking whether time.h defines timezone as an external variable... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5562,38 +5740,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_TIMEZONE
+#define HAVE_TIMEZONE /**/
 _ACEOF
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
-{ echo "$as_me:$LINENO: checking whether struct tz has tm_gmtoff as a member" >&5
-echo $ECHO_N "checking whether struct tz has tm_gmtoff as a member... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether struct tz has tm_gmtoff as a member" >&5
+$as_echo_n "checking whether struct tz has tm_gmtoff as a member... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5615,39 +5797,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_TM_GMTOFF
+#define HAVE_TM_GMTOFF /**/
 _ACEOF
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5719,20 +5902,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -5740,20 +5924,20 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
 if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
@@ -5776,20 +5960,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_inline=$ac_kw
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -5800,8 +5985,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 
 case $ac_cv_c_inline in
@@ -5819,26 +6004,58 @@ _ACEOF
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (size_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -5849,29 +6066,38 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
 if test $ac_cv_type_size_t = yes; then
   :
 else
@@ -5882,10 +6108,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
 if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5901,7 +6127,7 @@ main ()
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
- 				     return !p;
+				     return !p;
   ;
   return 0;
 }
@@ -5912,20 +6138,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_struct_tm=time.h
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_struct_tm=sys/time.h
@@ -5933,8 +6160,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5943,10 +6170,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
+$as_echo_n "checking for struct tm.tm_zone... " >&6; }
 if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5974,20 +6201,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -6016,20 +6244,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_tm_tm_zone=no
@@ -6040,8 +6269,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
+$as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; }
 if test $ac_cv_member_struct_tm_tm_zone = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -6058,10 +6287,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
-  { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
-echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether tzname is declared" >&5
+$as_echo_n "checking whether tzname is declared... " >&6; }
 if test "${ac_cv_have_decl_tzname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6088,20 +6317,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_tzname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_tzname=no
@@ -6109,8 +6339,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
-echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
+$as_echo "$ac_cv_have_decl_tzname" >&6; }
 if test $ac_cv_have_decl_tzname = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -6127,10 +6357,10 @@ _ACEOF
 fi
 
 
-  { echo "$as_me:$LINENO: checking for tzname" >&5
-echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
 if test "${ac_cv_var_tzname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6157,31 +6387,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_var_tzname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_var_tzname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
   if test $ac_cv_var_tzname = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -6191,28 +6425,72 @@ _ACEOF
   fi
 fi
 
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
+	       neither is defined;
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=universal
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -6224,33 +6502,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -6262,20 +6541,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -6283,29 +6563,31 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
   ;
   return 0;
 }
@@ -6316,138 +6598,104 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <limits.h>
+
 int
 main ()
 {
-
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
+	ac_cv_c_bigendian=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
 
+fi
 
-{ echo "$as_me:$LINENO: checking for char" >&5
-echo $ECHO_N "checking for char... $ECHO_C" >&6; }
-if test "${ac_cv_type_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-typedef char ac__type_new_;
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+return use_ascii (foo) == use_ebcdic (foo);
   ;
   return 0;
 }
@@ -6458,38 +6706,129 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_char=yes
-else
-  echo "$as_me: failed program was:" >&5
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_char=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=no
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
-echo "${ECHO_T}$ac_cv_type_char" >&6; }
+
+
+    fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
+      ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+   { (exit 1); exit 1; }; } ;;
+ esac
+
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of char" >&5
-echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of char" >&5
+$as_echo_n "checking size of char... " >&6; }
 if test "${ac_cv_sizeof_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -6500,11 +6839,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -6517,13 +6855,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -6537,11 +6876,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -6554,20 +6892,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -6581,7 +6920,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -6591,11 +6930,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
 test_array [0] = 0
 
   ;
@@ -6608,13 +6946,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -6628,11 +6967,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -6645,20 +6983,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -6672,7 +7011,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -6692,11 +7031,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -6709,20 +7047,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -6733,9 +7072,9 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_char=$ac_lo;;
 '') if test "$ac_cv_type_char" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char)
+$as_echo "$as_me: error: cannot compute sizeof (char)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -6750,9 +7089,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef char ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (char)); }
+static unsigned long int ulongval () { return (long int) (sizeof (char)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -6762,20 +7100,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (char))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (char))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (char))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -6788,43 +7128,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_char=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_char" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char)
+$as_echo "$as_me: error: cannot compute sizeof (char)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_char=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
 
 
 
@@ -6833,68 +7176,14 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_short=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
 if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -6905,11 +7194,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -6922,13 +7210,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -6942,11 +7231,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -6959,20 +7247,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -6986,7 +7275,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -6996,11 +7285,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
 test_array [0] = 0
 
   ;
@@ -7013,13 +7301,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -7033,11 +7322,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7050,20 +7338,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -7077,7 +7366,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -7097,11 +7386,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7114,20 +7402,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -7138,9 +7427,9 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
 '') if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
+$as_echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -7155,9 +7444,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef short ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (short)); }
+static unsigned long int ulongval () { return (long int) (sizeof (short)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -7167,20 +7455,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (short))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (short))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (short))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -7193,43 +7483,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_short=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
+$as_echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_short=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
 
 
 
@@ -7238,68 +7531,14 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
 if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -7310,11 +7549,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -7327,13 +7565,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -7347,11 +7586,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7364,20 +7602,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -7391,7 +7630,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -7401,11 +7640,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
 test_array [0] = 0
 
   ;
@@ -7418,13 +7656,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -7438,11 +7677,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7455,20 +7693,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -7482,7 +7721,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -7502,11 +7741,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7519,20 +7757,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -7543,9 +7782,9 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
 '') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
+$as_echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -7560,9 +7799,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (int)); }
+static unsigned long int ulongval () { return (long int) (sizeof (int)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -7572,20 +7810,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (int))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (int))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (int))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -7598,43 +7838,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
+$as_echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
 
 
@@ -7643,68 +7886,14 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
 if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -7715,11 +7904,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -7732,13 +7920,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -7752,11 +7941,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7769,20 +7957,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -7796,7 +7985,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -7806,11 +7995,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -7823,13 +8011,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -7843,11 +8032,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7860,20 +8048,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -7887,7 +8076,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -7907,11 +8096,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7924,20 +8112,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -7948,9 +8137,9 @@ done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -7965,9 +8154,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -7977,20 +8165,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (long))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -8003,43 +8193,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
@@ -8101,10 +8294,10 @@ else
 
   if test "$with_system_zlib" = yes; then
 
-{ echo "$as_me:$LINENO: checking for inflate in -lz" >&5
-echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+$as_echo_n "checking for inflate in -lz... " >&6; }
 if test "${ac_cv_lib_z_inflate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
@@ -8136,32 +8329,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_z_inflate=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_z_inflate=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
+$as_echo "$ac_cv_lib_z_inflate" >&6; }
 if test $ac_cv_lib_z_inflate = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
@@ -8170,8 +8367,8 @@ _ACEOF
   LIBS="-lz $LIBS"
 
 else
-  { echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
       with_system_zlib=no
 fi
 
@@ -8181,20 +8378,21 @@ fi
 
 for ac_header in zlib.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8210,32 +8408,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8249,69 +8448,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -8319,8 +8521,8 @@ fi
 done
 
     if test "$ac_cv_header_zlib_h" != yes; then
-      { echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
-echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
+$as_echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
       with_system_zlib=no
     fi
   fi
@@ -8397,10 +8599,10 @@ else
   CPP="$CPP $EXTRA_LIBPNG_INCLUDE"
 
   if test "$with_system_pnglib" = yes; then
-      { echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5
-echo $ECHO_N "checking for png_set_read_fn in -lpng... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5
+$as_echo_n "checking for png_set_read_fn in -lpng... " >&6; }
 if test "${ac_cv_lib_png_png_set_read_fn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
@@ -8432,37 +8634,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_png_png_set_read_fn=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_png_png_set_read_fn=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_set_read_fn" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5
+$as_echo "$ac_cv_lib_png_png_set_read_fn" >&6; }
 if test $ac_cv_lib_png_png_set_read_fn = yes; then
   pnglib=-lpng
 else
-  { echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
+$as_echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;}
         with_system_pnglib=no
 fi
 
@@ -8514,8 +8720,8 @@ _ACEOF
   # other configure tests don't try to link with kpathsea (which doesn't
   # exist at configure time).
   LIBS="-lkpathsea -lm $LIBS"
-  { echo "$as_me:$LINENO: tetex build enabled, LIBS now: $LIBS" >&5
-echo "$as_me: tetex build enabled, LIBS now: $LIBS" >&6;}
+  { $as_echo "$as_me:$LINENO: tetex build enabled, LIBS now: $LIBS" >&5
+$as_echo "$as_me: tetex build enabled, LIBS now: $LIBS" >&6;}
 else
   _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
 
@@ -8527,8 +8733,8 @@ if test "${with_paper+set}" = set; then
    fi
 fi
 
- { echo "$as_me:$LINENO: checking for paper header files" >&5
-echo $ECHO_N "checking for paper header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for paper header files" >&5
+$as_echo_n "checking for paper header files... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8550,23 +8756,24 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-   { echo "$as_me:$LINENO: checking for library containing paperpswidth" >&5
-echo $ECHO_N "checking for library containing paperpswidth... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for library containing paperpswidth" >&5
+$as_echo_n "checking for library containing paperpswidth... " >&6; }
 if test "${ac_cv_search_paperpswidth+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8604,26 +8811,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_paperpswidth=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_paperpswidth+set}" = set; then
@@ -8638,8 +8849,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_paperpswidth" >&5
-echo "${ECHO_T}$ac_cv_search_paperpswidth" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_paperpswidth" >&5
+$as_echo "$ac_cv_search_paperpswidth" >&6; }
 ac_res=$ac_cv_search_paperpswidth
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -8651,13 +8862,13 @@ _ACEOF
 fi
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CPPFLAGS=$_cppflags
    LDDFLAGS=$_ldflags
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -8672,8 +8883,8 @@ if test "${with_zlib+set}" = set; then
    fi
 fi
 
- { echo "$as_me:$LINENO: checking for zlib header files" >&5
-echo $ECHO_N "checking for zlib header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for zlib header files" >&5
+$as_echo_n "checking for zlib header files... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8695,23 +8906,24 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-      { echo "$as_me:$LINENO: checking for library containing compress" >&5
-echo $ECHO_N "checking for library containing compress... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for library containing compress" >&5
+$as_echo_n "checking for library containing compress... " >&6; }
 if test "${ac_cv_search_compress+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8749,26 +8961,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_compress=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_compress+set}" = set; then
@@ -8783,8 +8999,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
-echo "${ECHO_T}$ac_cv_search_compress" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
+$as_echo "$ac_cv_search_compress" >&6; }
 ac_res=$ac_cv_search_compress
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -8793,10 +9009,10 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_ZLIB 1
 _ACEOF
 
-        { echo "$as_me:$LINENO: checking for compress2 in -lz" >&5
-echo $ECHO_N "checking for compress2 in -lz... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for compress2 in -lz" >&5
+$as_echo_n "checking for compress2 in -lz... " >&6; }
 if test "${ac_cv_lib_z_compress2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
@@ -8828,32 +9044,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_z_compress2=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_z_compress2=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5
-echo "${ECHO_T}$ac_cv_lib_z_compress2" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5
+$as_echo "$ac_cv_lib_z_compress2" >&6; }
 if test $ac_cv_lib_z_compress2 = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -8865,13 +9085,13 @@ fi
 fi
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CPPFLAGS=$_cppflags
    LDDFLAGS=$_ldflags
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -8886,10 +9106,10 @@ if test "${with_png+set}" = set; then
    fi
 fi
 
- { echo "$as_me:$LINENO: checking for library containing pow" >&5
-echo $ECHO_N "checking for library containing pow... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for library containing pow" >&5
+$as_echo_n "checking for library containing pow... " >&6; }
 if test "${ac_cv_search_pow+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8927,26 +9147,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_pow=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_pow+set}" = set; then
@@ -8961,16 +9185,16 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5
-echo "${ECHO_T}$ac_cv_search_pow" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5
+$as_echo "$ac_cv_search_pow" >&6; }
 ac_res=$ac_cv_search_pow
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
- { echo "$as_me:$LINENO: checking for png header files" >&5
-echo $ECHO_N "checking for png header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for png header files" >&5
+$as_echo_n "checking for png header files... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8992,23 +9216,24 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-      { echo "$as_me:$LINENO: checking for library containing png_get_image_width" >&5
-echo $ECHO_N "checking for library containing png_get_image_width... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for library containing png_get_image_width" >&5
+$as_echo_n "checking for library containing png_get_image_width... " >&6; }
 if test "${ac_cv_search_png_get_image_width+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -9046,26 +9271,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_png_get_image_width=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_png_get_image_width+set}" = set; then
@@ -9080,8 +9309,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_png_get_image_width" >&5
-echo "${ECHO_T}$ac_cv_search_png_get_image_width" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_png_get_image_width" >&5
+$as_echo "$ac_cv_search_png_get_image_width" >&6; }
 ac_res=$ac_cv_search_png_get_image_width
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -9093,13 +9322,13 @@ _ACEOF
 fi
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CPPFLAGS=$_cppflags
    LDDFLAGS=$_ldflags
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -9143,11 +9372,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -9180,12 +9410,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -9201,7 +9431,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -9213,54 +9443,55 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+$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; }; }
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${TDS_VERSION_11_TRUE}" && test -z "${TDS_VERSION_11_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"TDS_VERSION_11\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"TDS_VERSION_11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"TDS_VERSION_11\" was never defined.
+$as_echo "$as_me: error: conditional \"TDS_VERSION_11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${TDS_VERSION_11_TRUE}" && test -z "${TDS_VERSION_11_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"TDS_VERSION_11\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"TDS_VERSION_11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"TDS_VERSION_11\" was never defined.
+$as_echo "$as_me: error: conditional \"TDS_VERSION_11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${TDS_VERSION_11_TRUE}" && test -z "${TDS_VERSION_11_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"TDS_VERSION_11\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"TDS_VERSION_11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"TDS_VERSION_11\" was never defined.
+$as_echo "$as_me: error: conditional \"TDS_VERSION_11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -9273,7 +9504,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -9283,7 +9514,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -9305,17 +9536,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -9331,8 +9590,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -9355,7 +9612,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -9368,17 +9625,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -9400,7 +9650,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -9451,7 +9701,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -9479,7 +9729,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -9492,19 +9741,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -9529,10 +9781,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -9555,7 +9807,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9568,7 +9820,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -9576,7 +9828,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -9589,9 +9841,9 @@ Usage: $0 [OPTIONS] [FILE]...
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -9605,13 +9857,13 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -9619,11 +9871,12 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -9645,30 +9898,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -9687,27 +9946,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -9715,7 +9976,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -9727,8 +9988,8 @@ do
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -9769,158 +10030,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
+ac_cr='
+'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
 
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
 
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-LN_S!$LN_S$ac_delim
-dvipdfmx_LDFLAGS!$dvipdfmx_LDFLAGS$ac_delim
-TDS_VERSION_11_TRUE!$TDS_VERSION_11_TRUE$ac_delim
-TDS_VERSION_11_FALSE!$TDS_VERSION_11_FALSE$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-ZLIBCPPFLAGS!$ZLIBCPPFLAGS$ac_delim
-LDZLIB!$LDZLIB$ac_delim
-ZLIBDEP!$ZLIBDEP$ac_delim
-LIBPNGCPPFLAGS!$LIBPNGCPPFLAGS$ac_delim
-LDLIBPNG!$LDLIBPNG$ac_delim
-LIBPNGDEP!$LIBPNGDEP$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -9936,19 +10182,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", line, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -9977,26 +10337,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -10006,7 +10378,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10032,7 +10404,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -10041,7 +10413,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10062,17 +10434,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10117,12 +10489,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -10131,13 +10504,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -10151,15 +10525,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -10170,121 +10545,60 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
@@ -10299,7 +10613,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+$as_echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10319,8 +10633,8 @@ echo X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -10342,7 +10656,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10386,7 +10700,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10412,7 +10726,7 @@ echo X"$file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -10421,7 +10735,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10442,8 +10756,8 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -10460,6 +10774,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -10481,5 +10800,9 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
diff --git a/Build/source/texk/dvipdfmx/configure.in b/Build/source/texk/dvipdfmx/configure.in
index 9a2fb0c99a2..80a1c6a7fd7 100644
--- a/Build/source/texk/dvipdfmx/configure.in
+++ b/Build/source/texk/dvipdfmx/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/dvipdfmx.c)
-AM_INIT_AUTOMAKE(dvipdfmx, 20061211)
+AM_INIT_AUTOMAKE(dvipdfmx, 20071115)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/Build/source/texk/dvipdfmx/data/CMap/EUC-UCS2 b/Build/source/texk/dvipdfmx/data/EUC-UCS2
index d7a91685ad5..d7a91685ad5 100644
--- a/Build/source/texk/dvipdfmx/data/CMap/EUC-UCS2
+++ b/Build/source/texk/dvipdfmx/data/EUC-UCS2
diff --git a/Build/source/texk/dvipdfmx/data/Makefile.am b/Build/source/texk/dvipdfmx/data/Makefile.am
index b210bfeee1b..d0f7dba3753 100644
--- a/Build/source/texk/dvipdfmx/data/Makefile.am
+++ b/Build/source/texk/dvipdfmx/data/Makefile.am
@@ -1,8 +1,18 @@
-pkgdatadir = $(datadir)/texmf/dvipdfm
-dist_pkgdata_DATA = \
-  $(srcdir)/CMap/EUC-UCS2 \
-  $(srcdir)/CMap/UniKSCms-UCS2-H \
-  $(srcdir)/CMap/UniKSCms-UCS2-V \
-  $(srcdir)/config/glyphlist.txt \
-  $(srcdir)/config/cid-x.map \
-  $(srcdir)/config/dvipdfmx.cfg
+configdatadir = $(datadir)/texmf/dvipdfm
+dist_configdata_DATA = \
+  $(srcdir)/dvipdfmx.cfg
+ 
+cmapdatadir = $(datadir)/texmf/fonts/cmap
+dist_cmapdata_DATA = \
+  $(srcdir)/EUC-UCS2 \
+  $(srcdir)/UniKSCms-UCS2-H \
+  $(srcdir)/UniKSCms-UCS2-V
+
+glyphlistdatadir = $(datadir)/texmf/fonts/map/glyphlist
+dist_glyphlistdata_DATA = \
+  $(srcdir)/glyphlist.txt \
+  $(srcdir)/pdfglyphlist.txt
+
+mapdatadir = $(datadir)/texmf/fonts/map/dvipdfmx
+dist_mapdata_DATA = \
+  $(srcdir)/cid-x.map
diff --git a/Build/source/texk/dvipdfmx/data/Makefile.in b/Build/source/texk/dvipdfmx/data/Makefile.in
index 5628b3a3bab..96b615d127a 100644
--- a/Build/source/texk/dvipdfmx/data/Makefile.in
+++ b/Build/source/texk/dvipdfmx/data/Makefile.in
@@ -15,6 +15,7 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -30,8 +31,9 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = data
-DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(dist_cmapdata_DATA) $(dist_configdata_DATA) \
+	$(dist_glyphlistdata_DATA) $(dist_mapdata_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cho-kpse.m4 \
 	$(top_srcdir)/m4/cho-libs.m4 $(top_srcdir)/m4/maw-time.m4 \
@@ -53,11 +55,16 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_pkgdata_DATA)
+am__installdirs = "$(DESTDIR)$(cmapdatadir)" \
+	"$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)" \
+	"$(DESTDIR)$(mapdatadir)"
+dist_cmapdataDATA_INSTALL = $(INSTALL_DATA)
+dist_configdataDATA_INSTALL = $(INSTALL_DATA)
+dist_glyphlistdataDATA_INSTALL = $(INSTALL_DATA)
+dist_mapdataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_cmapdata_DATA) $(dist_configdata_DATA) \
+	$(dist_glyphlistdata_DATA) $(dist_mapdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/texmf/dvipdfm
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -149,15 +156,27 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-dist_pkgdata_DATA = \
-  $(srcdir)/CMap/EUC-UCS2 \
-  $(srcdir)/CMap/UniKSCms-UCS2-H \
-  $(srcdir)/CMap/UniKSCms-UCS2-V \
-  $(srcdir)/config/glyphlist.txt \
-  $(srcdir)/config/cid-x.map \
-  $(srcdir)/config/dvipdfmx.cfg
+configdatadir = $(datadir)/texmf/dvipdfm
+dist_configdata_DATA = \
+  $(srcdir)/dvipdfmx.cfg
+
+cmapdatadir = $(datadir)/texmf/fonts/cmap
+dist_cmapdata_DATA = \
+  $(srcdir)/EUC-UCS2 \
+  $(srcdir)/UniKSCms-UCS2-H \
+  $(srcdir)/UniKSCms-UCS2-V
+
+glyphlistdatadir = $(datadir)/texmf/fonts/map/glyphlist
+dist_glyphlistdata_DATA = \
+  $(srcdir)/glyphlist.txt \
+  $(srcdir)/pdfglyphlist.txt
+
+mapdatadir = $(datadir)/texmf/fonts/map/dvipdfmx
+dist_mapdata_DATA = \
+  $(srcdir)/cid-x.map
 
 all: all-am
 
@@ -191,22 +210,73 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+install-dist_cmapdataDATA: $(dist_cmapdata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(cmapdatadir)" || $(MKDIR_P) "$(DESTDIR)$(cmapdatadir)"
+	@list='$(dist_cmapdata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_cmapdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cmapdatadir)/$$f'"; \
+	  $(dist_cmapdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cmapdatadir)/$$f"; \
+	done
+
+uninstall-dist_cmapdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_cmapdata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(cmapdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(cmapdatadir)/$$f"; \
+	done
+install-dist_configdataDATA: $(dist_configdata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(configdatadir)" || $(MKDIR_P) "$(DESTDIR)$(configdatadir)"
+	@list='$(dist_configdata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_configdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdatadir)/$$f'"; \
+	  $(dist_configdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdatadir)/$$f"; \
+	done
+
+uninstall-dist_configdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_configdata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(configdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(configdatadir)/$$f"; \
+	done
+install-dist_glyphlistdataDATA: $(dist_glyphlistdata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(glyphlistdatadir)" || $(MKDIR_P) "$(DESTDIR)$(glyphlistdatadir)"
+	@list='$(dist_glyphlistdata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_glyphlistdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(glyphlistdatadir)/$$f'"; \
+	  $(dist_glyphlistdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(glyphlistdatadir)/$$f"; \
+	done
+
+uninstall-dist_glyphlistdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_glyphlistdata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(glyphlistdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(glyphlistdatadir)/$$f"; \
+	done
+install-dist_mapdataDATA: $(dist_mapdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
+	test -z "$(mapdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mapdatadir)"
+	@list='$(dist_mapdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-	  $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	  echo " $(dist_mapdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mapdatadir)/$$f'"; \
+	  $(dist_mapdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mapdatadir)/$$f"; \
 	done
 
-uninstall-dist_pkgdataDATA:
+uninstall-dist_mapdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
+	@list='$(dist_mapdata_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(mapdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(mapdatadir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -245,7 +315,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+	for dir in "$(DESTDIR)$(cmapdatadir)" "$(DESTDIR)$(configdatadir)" "$(DESTDIR)$(glyphlistdatadir)" "$(DESTDIR)$(mapdatadir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -290,7 +360,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_pkgdataDATA
+install-data-am: install-dist_cmapdataDATA install-dist_configdataDATA \
+	install-dist_glyphlistdataDATA install-dist_mapdataDATA
 
 install-dvi: install-dvi-am
 
@@ -324,21 +395,26 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_pkgdataDATA
+uninstall-am: uninstall-dist_cmapdataDATA \
+	uninstall-dist_configdataDATA uninstall-dist_glyphlistdataDATA \
+	uninstall-dist_mapdataDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_pkgdataDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_pkgdataDATA
+	install-dist_cmapdataDATA install-dist_configdataDATA \
+	install-dist_glyphlistdataDATA install-dist_mapdataDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-dist_cmapdataDATA \
+	uninstall-dist_configdataDATA uninstall-dist_glyphlistdataDATA \
+	uninstall-dist_mapdataDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/dvipdfmx/data/CMap/UniKSCms-UCS2-H b/Build/source/texk/dvipdfmx/data/UniKSCms-UCS2-H
index 91a234656e2..91a234656e2 100644
--- a/Build/source/texk/dvipdfmx/data/CMap/UniKSCms-UCS2-H
+++ b/Build/source/texk/dvipdfmx/data/UniKSCms-UCS2-H
diff --git a/Build/source/texk/dvipdfmx/data/CMap/UniKSCms-UCS2-V b/Build/source/texk/dvipdfmx/data/UniKSCms-UCS2-V
index 9e5e61e5f95..9e5e61e5f95 100644
--- a/Build/source/texk/dvipdfmx/data/CMap/UniKSCms-UCS2-V
+++ b/Build/source/texk/dvipdfmx/data/UniKSCms-UCS2-V
diff --git a/Build/source/texk/dvipdfmx/data/cid-x.map b/Build/source/texk/dvipdfmx/data/cid-x.map
new file mode 100644
index 00000000000..d2969113d7f
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/data/cid-x.map
@@ -0,0 +1,149 @@
+%% This file 'cid-x.map' is read by dvipdfmx for default
+%% dvipdfmx.cfg setting.  Please append fontmap entries here.
+%%
+%% FONTMAP: CID-keyed font mapping file for dvipdfmx
+%% =================================================
+%%
+%% Last modified: April 4, 2004
+%%
+%% FORMAT
+%% ------
+%%
+%% TFMNAME[@SFDNAME@] ENCNAME|CMapNAME [:INDEX:][!]FONTNAME[/CSI][,VARIANT] [OPTIONS]
+%%
+%%
+%% DESCRIPTION
+%% -----------
+%%
+%% 1) TFMNAME[@SFDNAME@]
+%%
+%%    TFMNAME is a name of TeX fonts in usual if no SFDNAME is attached.
+%%    Otherwise, TFMNAME is the basename of TeX fonts, for example,
+%%    cyberb@Unicode@ expands to cyberb00 -- cyberbff, where Unicode.sfd
+%%    contains subfont definitions with name from 00 to ff.
+%%    Moreover, both TFMNAME and SFDNAME do not contain file extensions.
+%%
+%% 2) ENCNAME|CMapNAME
+%%
+%%    ENCNAME is the name of an 8-bit encoding file, e.g., 8r.enc.
+%%    CMapNAME is the name of a CMap file which is used as a 16-bit
+%%    encoding file. In particular, if UCS2 (2-byte Unicode) is used
+%%    as a 16-bit encoding, it suffices to set CMapNAME to unicode
+%%    even if no corresponding CMap file exists.
+%%
+%% 3) [:INDEX:][!]FONTNAME[/CSI][,VARIANT]
+%%
+%%    Font name is specified in the field FONTNAME with or without
+%%    extension. The field INDEX is used for TrueType collections (.ttc)
+%%    to specify the font index number. The character `!' enables the
+%%    no-embedding option. The /CSI option is required for TrueType fonts
+%%    when Identity CMap is specified in the ENCNAME. The stylistic variants
+%%    (Bold, Italic, BoldItalic) are specified in the filed VARIANT.
+%%    See examples below.
+%%
+%% 4) [OPTIONS]
+%%
+%%    All options available in the original dvipdfm are also valid here.
+%%    The remap option [-r] is simply ignored.
+
+%%
+%% Omega Examples
+%%
+
+%% Chinese
+%% Arphic TrueType fonts as Adobe-{CNS1,GB1} CID-keyed font.
+%ombkai UniCNS-UCS2-H bkai00mp
+%ombsmi UniCNS-UCS2-H bsmi00lp
+%omgkai UniGB-UCS2-H  gkai00mp
+%omgbsn UniGB-UCS2-H  gbsn00lp
+
+%% Japanese
+%% Adobe-Japan1
+omrml  UniJIS-UCS2-H Ryumin-Light
+omgbm  UniJIS-UCS2-H GothicBBB-Medium
+
+%% Korean
+%omgtm  UniKS-UCS2-H  HYGoThic-Medium
+%ombtr  UniKS-UCS2-H  batang
+
+%%
+%% ASCII pTeX Examples
+%%
+
+%% Ryumin and GothicBBB found in PostScript printers:
+rml  H Ryumin-Light
+gbm  H GothicBBB-Medium
+rmlv V Ryumin-Light
+gbmv V GothicBBB-Medium
+
+%% Synthetic font used for futo* family.
+%% jun101 not available.
+%ryumin-l    H Ryumin-Light
+%gtbbb-m     H GothicBBB-Medium
+%futomin-b   H Ryumin-Light,Bold
+%futogo-b    H GothicBBB-Medium,Bold
+%ryumin-l-v  V Ryumin-Light
+%gtbbb-m-v   V GothicBBB-Medium
+%futomin-b-v V Ryumin-Light,Bold
+%futogo-b-v  V GothicBBB-Medium,Bold
+
+%% Morisawa OpenType Basic 7 Family Pack
+%%
+%ryumin-l     H A-OTF-RyuminPro-Light
+%ryumin-l-v   V A-OTF-RyuminPro-Light
+%gtbbb-m      H A-OTF-GothicBBBPro-Medium
+%gtbbb-m-v    V A-OTF-GothicBBBPro-Medium
+%futomin-b    H A-OTF-FutoMinA101Pro-Bold
+%futomin-b-v  V A-OTF-FutoMinA101Pro-Bold
+%futogo-b     H A-OTF-FutoGoB101Pro-Bold
+%futogo-b-v   V A-OTF-FutoGoB101Pro-Bold
+%jun101-l     H A-OTF-Jun101Pro-Light
+%jun101-l-v   V A-OTF-Jun101Pro-Light
+
+%% MS Mincho/Gothic 
+%msmin H msmincho
+%msgot H msgothic
+
+%% MS-Mincho with proportional latin and kana:
+%msminp H :1:msmincho
+
+%% Hojo-Kanji (JIS X 0212-1990): Adobe-Japan2
+%hmin  Hojo-H msmincho
+%hminv Hojo-V msmincho
+
+%%
+%% CJK-LaTeX/HLaTeX Examples
+%%
+
+%% Arphic Public Licence fonts:
+%%  AR PL KaitiM, AR PL Mingti2L, AR PL SungtiL
+
+%bsmi@Big5@  ETen-B5-H  bsmi00lp
+%bkai@Big5@  ETen-B5-H  bkai00mp
+%gbsn@EUC@   GB-EUC-H   gbsn00lp
+%gkai@EUC@   GB-EUC-H   gkai00mp
+%bsmir@Big5@ ETen-B5-V  bsmi00lp
+%bkair@Big5@ ETen-B5-V  bkai00mp
+%gbsnr@EUC@  GB-EUC-V   gbsn00lp
+%gkair@EUC@  GB-EUC-V   gkai00mp
+
+%% Korean MS-Windows fonts with stylistic variants
+%jbtm@UKS@  UniKS-UCS2-H !batang
+%jbtmo@UKS@ UniKS-UCS2-H !batang,Italic
+%jbtb@UKS@  UniKS-UCS2-H !batang,Bold
+%jbtbo@UKS@ UniKS-UCS2-H !batang,BoldItalic
+
+%% Baekmuk fonts (used with HLaTeX package)
+%bbtm@KS-HLaTeX@   KSCms-UHC-H  batang
+%bbtmo@UKS-HLaTeX@ UniKS-UCS2-H batang -s .167
+
+%% Heisei family of Acrobat Asian Font Packs:
+%% Not embedded.
+%mincho@UJIS@ UniJIS-UCS2-H HeiseiMin-W3-Acro
+%gothic@UJIS@ UniJIS-UCS2-H HeiseiKakuGo-W5-Acro
+
+%% Bitstream Cyberbit
+%% Available at:
+%%  http://ftp.netscape.com/pub/communicator/extras/fonts/windows/ReadMe.htm
+
+%cyberb@Unicode@ unicode cyberbit
diff --git a/Build/source/texk/dvipdfmx/data/config/cid-x.map b/Build/source/texk/dvipdfmx/data/config/cid-x.map
deleted file mode 100644
index 9baa046cd4f..00000000000
--- a/Build/source/texk/dvipdfmx/data/config/cid-x.map
+++ /dev/null
@@ -1,3 +0,0 @@
-%% This file 'cid-x.map' is read by dvipdfmx for default
-%% dvipdfmx.cfg setting.  Please append fontmap entries here.
-
diff --git a/Build/source/texk/dvipdfmx/data/config/dvipdfmx.cfg b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
index 64e09f37980..1b960e60cee 100644
--- a/Build/source/texk/dvipdfmx/data/config/dvipdfmx.cfg
+++ b/Build/source/texk/dvipdfmx/data/dvipdfmx.cfg
@@ -14,7 +14,7 @@
 %% model requires version 1.4. So if you want soft-masking support for
 %% PNG image with alpha channels, you should set version to 4 or higher.
 
-V  4
+% V  4
 
 %%
 %% Dvipdfmx Compatibility Flags
@@ -28,7 +28,6 @@ V  4
 
 %C  0x0000
 
-
 %%
 %% PDF Document Settings
 %%
@@ -62,7 +61,6 @@ p  a4
 g  1
 O  0
 
-
 %%
 %% PDF Security (Encryption) Setting
 %%
@@ -103,7 +101,6 @@ K  40
 
 P  0x003C
 
-
 %%
 %% Image Handler
 %%
@@ -135,7 +132,7 @@ P  0x003C
 %% simply means large size paper)
 %%
 %% GhostScript (Unix/Linux):
-%D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
+D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
 
 %% GhostScript (Win32):
 %D  "gswin32c -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
@@ -163,6 +160,7 @@ P  0x003C
 %% Other Options
 %%
 %% DPI for PK font creation
+
 %r  600
 
 %% Set number of fractional digit kept for various numbers in PDF page
@@ -172,13 +170,19 @@ P  0x003C
 %% for old Acrobat due to implementation limit of Acrobat.
 %% Length 0.01 in unscaled coordinate system amount to width of 1 pixel
 %% in 7200ppi display. 
+
 %d  5
 
 %%
 %% Font Map Files
 %%
-%% Lookup order is different than dvipdfm, see 'C' option above.
-%%
+
+% For correct searching / text extraction of ligatures, etc., of cm
+% fonts, which are given without an encoding in the map files.  However,
+% if the latin modern fonts are desired/used instead of bluesky, this
+% won't be needed and should be removed.
+%f cm-dvipdfm-fix.map
+
 %% teTeX 2.x using updmap
 
 f  dvipdfm.map
@@ -187,7 +191,5 @@ f  dvipdfm.map
 
 %f psfonts.map
 
-
 %% Put additonal fontmap files here
 f  cid-x.map
-
diff --git a/Build/source/texk/dvipdfmx/data/config/glyphlist.txt b/Build/source/texk/dvipdfmx/data/glyphlist.txt
index a1a22702a8e..0304ffc6674 100644
--- a/Build/source/texk/dvipdfmx/data/config/glyphlist.txt
+++ b/Build/source/texk/dvipdfmx/data/glyphlist.txt
@@ -1,3 +1,34 @@
+# ###################################################################################
+# Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this documentation file to use, copy, publish, distribute,
+# sublicense, and/or sell copies of the documentation, and to permit
+# others to do the same, provided that:
+# - No modification, editing or other alteration of this document is
+# allowed; and
+# - The above copyright notice and this permission notice shall be
+# included in all copies of the documentation.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this documentation file, to create their own derivative works
+# from the content of this document to use, copy, publish, distribute,
+# sublicense, and/or sell the derivative works, and to permit others to do
+# the same, provided that the derived work is not represented as being a
+# copy or version of this document.
+# 
+# Adobe shall not be liable to any party for any loss of revenue or profit
+# or for indirect, incidental, special, consequential, or other similar
+# damages, whether based on tort (including without limitation negligence
+# or strict liability), contract or other legal or equitable grounds even
+# if Adobe has been advised or had reason to know of the possibility of
+# such damages.� The Adobe materials are provided on an "AS IS" basis.�
+# Adobe specifically disclaims all express, statutory, or implied
+# warranties relating to the Adobe materials, including but not limited to
+# those concerning merchantability or fitness for a particular purpose or
+# non-infringement of any third party rights regarding the Adobe
+# materials.
+# ###################################################################################
 # Name:          Adobe Glyph List
 # Table version: 2.0
 # Date:          September 20, 2002
diff --git a/Build/source/texk/dvipdfmx/data/pdfglyphlist.txt b/Build/source/texk/dvipdfmx/data/pdfglyphlist.txt
new file mode 100644
index 00000000000..25596f152dd
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/data/pdfglyphlist.txt
@@ -0,0 +1,385 @@
+# Entries of the Adobe Glyph List contained 
+# in the PDF Latin Character Set and Symbol Set.
+#
+# Compiled from the Adobe Glyph List 2.0 and the
+# PDF 1.5 reference.
+#
+# See http://partners.adobe.com/asn/developer/typeforum/unicodegn.html
+#
+# Format: Semicolon-delimited fields:
+#            (1) glyph name
+#            (2) Unicode scalar value
+A;0041
+AE;00C6
+Aacute;00C1
+Acircumflex;00C2
+Adieresis;00C4
+Agrave;00C0
+Alpha;0391
+Aring;00C5
+Atilde;00C3
+B;0042
+Beta;0392
+C;0043
+Ccedilla;00C7
+Chi;03A7
+D;0044
+Delta;2206
+E;0045
+Eacute;00C9
+Ecircumflex;00CA
+Edieresis;00CB
+Egrave;00C8
+Epsilon;0395
+Eta;0397
+Eth;00D0
+Euro;20AC
+F;0046
+G;0047
+Gamma;0393
+H;0048
+I;0049
+Iacute;00CD
+Icircumflex;00CE
+Idieresis;00CF
+Ifraktur;2111
+Igrave;00CC
+Iota;0399
+J;004A
+K;004B
+Kappa;039A
+L;004C
+Lambda;039B
+Lslash;0141
+M;004D
+Mu;039C
+N;004E
+Ntilde;00D1
+Nu;039D
+O;004F
+OE;0152
+Oacute;00D3
+Ocircumflex;00D4
+Odieresis;00D6
+Ograve;00D2
+Omega;2126
+Omicron;039F
+Oslash;00D8
+Otilde;00D5
+P;0050
+Phi;03A6
+Pi;03A0
+Psi;03A8
+Q;0051
+R;0052
+Rfraktur;211C
+Rho;03A1
+S;0053
+Scaron;0160
+Sigma;03A3
+T;0054
+Tau;03A4
+Theta;0398
+Thorn;00DE
+U;0055
+Uacute;00DA
+Ucircumflex;00DB
+Udieresis;00DC
+Ugrave;00D9
+Upsilon1;03D2
+Upsilon;03A5
+V;0056
+W;0057
+X;0058
+Xi;039E
+Y;0059
+Yacute;00DD
+Ydieresis;0178
+Z;005A
+Zcaron;017D
+Zeta;0396
+a;0061
+aacute;00E1
+acircumflex;00E2
+acute;00B4
+adieresis;00E4
+ae;00E6
+agrave;00E0
+aleph;2135
+alpha;03B1
+ampersand;0026
+angle;2220
+angleleft;2329
+angleright;232A
+approxequal;2248
+aring;00E5
+arrowboth;2194
+arrowdblboth;21D4
+arrowdbldown;21D3
+arrowdblleft;21D0
+arrowdblright;21D2
+arrowdblup;21D1
+arrowdown;2193
+arrowhorizex;F8E7
+arrowleft;2190
+arrowright;2192
+arrowup;2191
+arrowvertex;F8E6
+asciicircum;005E
+asciitilde;007E
+asterisk;002A
+asteriskmath;2217
+at;0040
+atilde;00E3
+b;0062
+backslash;005C
+bar;007C
+beta;03B2
+braceex;F8F4
+braceleft;007B
+braceleftbt;F8F3
+braceleftmid;F8F2
+bracelefttp;F8F1
+braceright;007D
+bracerightbt;F8FE
+bracerightmid;F8FD
+bracerighttp;F8FC
+bracketleft;005B
+bracketleftbt;F8F0
+bracketleftex;F8EF
+bracketlefttp;F8EE
+bracketright;005D
+bracketrightbt;F8FB
+bracketrightex;F8FA
+bracketrighttp;F8F9
+breve;02D8
+brokenbar;00A6
+bullet;2022
+c;0063
+caron;02C7
+carriagereturn;21B5
+ccedilla;00E7
+cedilla;00B8
+cent;00A2
+chi;03C7
+circlemultiply;2297
+circleplus;2295
+circumflex;02C6
+club;2663
+colon;003A
+comma;002C
+congruent;2245
+copyright;00A9
+copyrightsans;F8E9
+copyrightserif;F6D9
+currency;00A4
+d;0064
+dagger;2020
+daggerdbl;2021
+degree;00B0
+delta;03B4
+diamond;2666
+dieresis;00A8
+divide;00F7
+dollar;0024
+dotaccent;02D9
+dotlessi;0131
+dotmath;22C5
+e;0065
+eacute;00E9
+ecircumflex;00EA
+edieresis;00EB
+egrave;00E8
+eight;0038
+element;2208
+ellipsis;2026
+emdash;2014
+emptyset;2205
+endash;2013
+epsilon;03B5
+equal;003D
+equivalence;2261
+eta;03B7
+eth;00F0
+exclam;0021
+exclamdown;00A1
+existential;2203
+f;0066
+fi;FB01
+five;0035
+fl;FB02
+florin;0192
+four;0034
+fraction;2044
+g;0067
+gamma;03B3
+germandbls;00DF
+gradient;2207
+grave;0060
+greater;003E
+greaterequal;2265
+guillemotleft;00AB
+guillemotright;00BB
+guilsinglleft;2039
+guilsinglright;203A
+h;0068
+heart;2665
+hungarumlaut;02DD
+hyphen;002D
+i;0069
+iacute;00ED
+icircumflex;00EE
+idieresis;00EF
+igrave;00EC
+infinity;221E
+integral;222B
+integralbt;2321
+integralex;F8F5
+integraltp;2320
+intersection;2229
+iota;03B9
+j;006A
+k;006B
+kappa;03BA
+l;006C
+lambda;03BB
+less;003C
+lessequal;2264
+logicaland;2227
+logicalnot;00AC
+logicalor;2228
+lozenge;25CA
+lslash;0142
+m;006D
+macron;00AF
+minus;2212
+minute;2032
+mu;00B5
+multiply;00D7
+n;006E
+nine;0039
+notelement;2209
+notequal;2260
+notsubset;2284
+ntilde;00F1
+nu;03BD
+numbersign;0023
+o;006F
+oacute;00F3
+ocircumflex;00F4
+odieresis;00F6
+oe;0153
+ogonek;02DB
+ograve;00F2
+omega1;03D6
+omega;03C9
+omicron;03BF
+one;0031
+onehalf;00BD
+onequarter;00BC
+onesuperior;00B9
+ordfeminine;00AA
+ordmasculine;00BA
+oslash;00F8
+otilde;00F5
+p;0070
+paragraph;00B6
+parenleft;0028
+parenleftbt;F8ED
+parenleftex;F8EC
+parenlefttp;F8EB
+parenright;0029
+parenrightbt;F8F8
+parenrightex;F8F7
+parenrighttp;F8F6
+partialdiff;2202
+percent;0025
+period;002E
+periodcentered;00B7
+perpendicular;22A5
+perthousand;2030
+phi1;03D5
+phi;03C6
+pi;03C0
+plus;002B
+plusminus;00B1
+product;220F
+propersubset;2282
+propersuperset;2283
+proportional;221D
+psi;03C8
+q;0071
+question;003F
+questiondown;00BF
+quotedbl;0022
+quotedblbase;201E
+quotedblleft;201C
+quotedblright;201D
+quoteleft;2018
+quoteright;2019
+quotesinglbase;201A
+quotesingle;0027
+r;0072
+radical;221A
+radicalex;F8E5
+reflexsubset;2286
+reflexsuperset;2287
+registered;00AE
+registersans;F8E8
+registerserif;F6DA
+rho;03C1
+ring;02DA
+s;0073
+scaron;0161
+second;2033
+section;00A7
+semicolon;003B
+seven;0037
+sigma1;03C2
+sigma;03C3
+similar;223C
+six;0036
+slash;002F
+space;0020
+spade;2660
+sterling;00A3
+suchthat;220B
+summation;2211
+t;0074
+tau;03C4
+therefore;2234
+theta1;03D1
+theta;03B8
+thorn;00FE
+three;0033
+threequarters;00BE
+threesuperior;00B3
+tilde;02DC
+trademark;2122
+trademarksans;F8EA
+trademarkserif;F6DB
+two;0032
+twosuperior;00B2
+u;0075
+uacute;00FA
+ucircumflex;00FB
+udieresis;00FC
+ugrave;00F9
+underscore;005F
+union;222A
+universal;2200
+upsilon;03C5
+v;0076
+w;0077
+weierstrass;2118
+x;0078
+xi;03BE
+y;0079
+yacute;00FD
+ydieresis;00FF
+yen;00A5
+z;007A
+zcaron;017E
+zero;0030
+zeta;03B6
+#--end
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am b/Build/source/texk/dvipdfmx/src/Makefile.am
index 061c7efd192..cfd424f11e4 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.am
+++ b/Build/source/texk/dvipdfmx/src/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = dvipdfmx
+bin_PROGRAMS = dvipdfmx xbb
 dvipdfmx_SOURCES = agl.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
 cmap.c cmap_read.c cmap_write.c cs_type2.c \
 dpxconf.c dpxcrypt.c dpxfile.c dpxutil.c \
@@ -11,7 +11,7 @@ subfont.c tfm.c \
 tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \
 type0.c t1_char.c t1_load.c type1.c type1c.c \
 unicode.c vf.c \
-agl.h bmpimage.h asl_charset.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
+agl.h bmpimage.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
 cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \
 cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \
 jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \
@@ -23,6 +23,8 @@ tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h truetype.h \
 type0.h t1_char.h t1_load.h type1.h type1c.h \
 unicode.h vf.h
 
+xbb_SOURCES = xbb.c pdfobj.c pdfparse.c dpxfile.c dpxutil.c error.c mem.c mfileio.c numbers.c pdfobj.h pdfparse.h dpxfile.h dpxutil.h error.h mem.h mfileio.h numbers.h
+
 LIBPNGDIR=$(top_builddir)/../../libs/libpng
 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
 LIBPNGDEP = @LIBPNGDEP@
@@ -37,3 +39,8 @@ dvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@
 dvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB)
 dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP)
 dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
+
+xbb_CPPFLAGS = @LIBPNGCPPFLAGS@
+xbb_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB)
+xbb_DEPENDENCIES = $(LIBPNGDEP) $(LDZLIB)
+xbb_LDFLAGS = @dvipdfmx_LDFLAGS@
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in
index a3b1661c765..849285b693c 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.in
+++ b/Build/source/texk/dvipdfmx/src/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-bin_PROGRAMS = dvipdfmx$(EXEEXT)
+bin_PROGRAMS = dvipdfmx$(EXEEXT) xbb$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -88,6 +88,13 @@ dvipdfmx_OBJECTS = $(am_dvipdfmx_OBJECTS)
 am__DEPENDENCIES_1 =
 dvipdfmx_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dvipdfmx_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am_xbb_OBJECTS = xbb-xbb.$(OBJEXT) xbb-pdfobj.$(OBJEXT) \
+	xbb-pdfparse.$(OBJEXT) xbb-dpxfile.$(OBJEXT) \
+	xbb-dpxutil.$(OBJEXT) xbb-error.$(OBJEXT) xbb-mem.$(OBJEXT) \
+	xbb-mfileio.$(OBJEXT) xbb-numbers.$(OBJEXT)
+xbb_OBJECTS = $(am_xbb_OBJECTS)
+xbb_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xbb_LDFLAGS) $(LDFLAGS) -o \
+	$@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -95,8 +102,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(dvipdfmx_SOURCES)
-DIST_SOURCES = $(dvipdfmx_SOURCES)
+SOURCES = $(dvipdfmx_SOURCES) $(xbb_SOURCES)
+DIST_SOURCES = $(dvipdfmx_SOURCES) $(xbb_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -191,6 +198,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 dvipdfmx_SOURCES = agl.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
@@ -205,7 +213,7 @@ subfont.c tfm.c \
 tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \
 type0.c t1_char.c t1_load.c type1.c type1c.c \
 unicode.c vf.c \
-agl.h bmpimage.h asl_charset.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
+agl.h bmpimage.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
 cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \
 cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \
 jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \
@@ -217,6 +225,7 @@ tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h truetype.h \
 type0.h t1_char.h t1_load.h type1.h type1c.h \
 unicode.h vf.h
 
+xbb_SOURCES = xbb.c pdfobj.c pdfparse.c dpxfile.c dpxutil.c error.c mem.c mfileio.c numbers.c pdfobj.h pdfparse.h dpxfile.h dpxutil.h error.h mem.h mfileio.h numbers.h
 LIBPNGDIR = $(top_builddir)/../../libs/libpng
 LIBPNGSRCDIR = $(srcdir)/$(LIBPNGDIR)
 ZLIBDIR = $(top_builddir)/../../libs/zlib
@@ -224,6 +233,10 @@ ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR)
 dvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@
 dvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB)
 dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP)
+xbb_CPPFLAGS = @LIBPNGCPPFLAGS@
+xbb_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB)
+xbb_DEPENDENCIES = $(LIBPNGDEP) $(LDZLIB)
+xbb_LDFLAGS = @dvipdfmx_LDFLAGS@
 all: all-am
 
 .SUFFIXES:
@@ -283,6 +296,9 @@ clean-binPROGRAMS:
 dvipdfmx$(EXEEXT): $(dvipdfmx_OBJECTS) $(dvipdfmx_DEPENDENCIES) 
 	@rm -f dvipdfmx$(EXEEXT)
 	$(dvipdfmx_LINK) $(dvipdfmx_OBJECTS) $(dvipdfmx_LDADD) $(LIBS)
+xbb$(EXEEXT): $(xbb_OBJECTS) $(xbb_DEPENDENCIES) 
+	@rm -f xbb$(EXEEXT)
+	$(xbb_LINK) $(xbb_OBJECTS) $(xbb_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -358,6 +374,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvipdfmx-type1c.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvipdfmx-unicode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvipdfmx-vf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-dpxfile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-dpxutil.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-error.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-mem.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-mfileio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-numbers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-pdfobj.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-pdfparse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb-xbb.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1325,6 +1350,132 @@ dvipdfmx-vf.obj: vf.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvipdfmx-vf.obj `if test -f 'vf.c'; then $(CYGPATH_W) 'vf.c'; else $(CYGPATH_W) '$(srcdir)/vf.c'; fi`
 
+xbb-xbb.o: xbb.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-xbb.o -MD -MP -MF $(DEPDIR)/xbb-xbb.Tpo -c -o xbb-xbb.o `test -f 'xbb.c' || echo '$(srcdir)/'`xbb.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-xbb.Tpo $(DEPDIR)/xbb-xbb.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xbb.c' object='xbb-xbb.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-xbb.o `test -f 'xbb.c' || echo '$(srcdir)/'`xbb.c
+
+xbb-xbb.obj: xbb.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-xbb.obj -MD -MP -MF $(DEPDIR)/xbb-xbb.Tpo -c -o xbb-xbb.obj `if test -f 'xbb.c'; then $(CYGPATH_W) 'xbb.c'; else $(CYGPATH_W) '$(srcdir)/xbb.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-xbb.Tpo $(DEPDIR)/xbb-xbb.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xbb.c' object='xbb-xbb.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-xbb.obj `if test -f 'xbb.c'; then $(CYGPATH_W) 'xbb.c'; else $(CYGPATH_W) '$(srcdir)/xbb.c'; fi`
+
+xbb-pdfobj.o: pdfobj.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-pdfobj.o -MD -MP -MF $(DEPDIR)/xbb-pdfobj.Tpo -c -o xbb-pdfobj.o `test -f 'pdfobj.c' || echo '$(srcdir)/'`pdfobj.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-pdfobj.Tpo $(DEPDIR)/xbb-pdfobj.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pdfobj.c' object='xbb-pdfobj.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-pdfobj.o `test -f 'pdfobj.c' || echo '$(srcdir)/'`pdfobj.c
+
+xbb-pdfobj.obj: pdfobj.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-pdfobj.obj -MD -MP -MF $(DEPDIR)/xbb-pdfobj.Tpo -c -o xbb-pdfobj.obj `if test -f 'pdfobj.c'; then $(CYGPATH_W) 'pdfobj.c'; else $(CYGPATH_W) '$(srcdir)/pdfobj.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-pdfobj.Tpo $(DEPDIR)/xbb-pdfobj.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pdfobj.c' object='xbb-pdfobj.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-pdfobj.obj `if test -f 'pdfobj.c'; then $(CYGPATH_W) 'pdfobj.c'; else $(CYGPATH_W) '$(srcdir)/pdfobj.c'; fi`
+
+xbb-pdfparse.o: pdfparse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-pdfparse.o -MD -MP -MF $(DEPDIR)/xbb-pdfparse.Tpo -c -o xbb-pdfparse.o `test -f 'pdfparse.c' || echo '$(srcdir)/'`pdfparse.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-pdfparse.Tpo $(DEPDIR)/xbb-pdfparse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pdfparse.c' object='xbb-pdfparse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-pdfparse.o `test -f 'pdfparse.c' || echo '$(srcdir)/'`pdfparse.c
+
+xbb-pdfparse.obj: pdfparse.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-pdfparse.obj -MD -MP -MF $(DEPDIR)/xbb-pdfparse.Tpo -c -o xbb-pdfparse.obj `if test -f 'pdfparse.c'; then $(CYGPATH_W) 'pdfparse.c'; else $(CYGPATH_W) '$(srcdir)/pdfparse.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-pdfparse.Tpo $(DEPDIR)/xbb-pdfparse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pdfparse.c' object='xbb-pdfparse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-pdfparse.obj `if test -f 'pdfparse.c'; then $(CYGPATH_W) 'pdfparse.c'; else $(CYGPATH_W) '$(srcdir)/pdfparse.c'; fi`
+
+xbb-dpxfile.o: dpxfile.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-dpxfile.o -MD -MP -MF $(DEPDIR)/xbb-dpxfile.Tpo -c -o xbb-dpxfile.o `test -f 'dpxfile.c' || echo '$(srcdir)/'`dpxfile.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-dpxfile.Tpo $(DEPDIR)/xbb-dpxfile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dpxfile.c' object='xbb-dpxfile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-dpxfile.o `test -f 'dpxfile.c' || echo '$(srcdir)/'`dpxfile.c
+
+xbb-dpxfile.obj: dpxfile.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-dpxfile.obj -MD -MP -MF $(DEPDIR)/xbb-dpxfile.Tpo -c -o xbb-dpxfile.obj `if test -f 'dpxfile.c'; then $(CYGPATH_W) 'dpxfile.c'; else $(CYGPATH_W) '$(srcdir)/dpxfile.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-dpxfile.Tpo $(DEPDIR)/xbb-dpxfile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dpxfile.c' object='xbb-dpxfile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-dpxfile.obj `if test -f 'dpxfile.c'; then $(CYGPATH_W) 'dpxfile.c'; else $(CYGPATH_W) '$(srcdir)/dpxfile.c'; fi`
+
+xbb-dpxutil.o: dpxutil.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-dpxutil.o -MD -MP -MF $(DEPDIR)/xbb-dpxutil.Tpo -c -o xbb-dpxutil.o `test -f 'dpxutil.c' || echo '$(srcdir)/'`dpxutil.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-dpxutil.Tpo $(DEPDIR)/xbb-dpxutil.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dpxutil.c' object='xbb-dpxutil.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-dpxutil.o `test -f 'dpxutil.c' || echo '$(srcdir)/'`dpxutil.c
+
+xbb-dpxutil.obj: dpxutil.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-dpxutil.obj -MD -MP -MF $(DEPDIR)/xbb-dpxutil.Tpo -c -o xbb-dpxutil.obj `if test -f 'dpxutil.c'; then $(CYGPATH_W) 'dpxutil.c'; else $(CYGPATH_W) '$(srcdir)/dpxutil.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-dpxutil.Tpo $(DEPDIR)/xbb-dpxutil.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dpxutil.c' object='xbb-dpxutil.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-dpxutil.obj `if test -f 'dpxutil.c'; then $(CYGPATH_W) 'dpxutil.c'; else $(CYGPATH_W) '$(srcdir)/dpxutil.c'; fi`
+
+xbb-error.o: error.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-error.o -MD -MP -MF $(DEPDIR)/xbb-error.Tpo -c -o xbb-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-error.Tpo $(DEPDIR)/xbb-error.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='error.c' object='xbb-error.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c
+
+xbb-error.obj: error.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-error.obj -MD -MP -MF $(DEPDIR)/xbb-error.Tpo -c -o xbb-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-error.Tpo $(DEPDIR)/xbb-error.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='error.c' object='xbb-error.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`
+
+xbb-mem.o: mem.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-mem.o -MD -MP -MF $(DEPDIR)/xbb-mem.Tpo -c -o xbb-mem.o `test -f 'mem.c' || echo '$(srcdir)/'`mem.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-mem.Tpo $(DEPDIR)/xbb-mem.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mem.c' object='xbb-mem.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-mem.o `test -f 'mem.c' || echo '$(srcdir)/'`mem.c
+
+xbb-mem.obj: mem.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-mem.obj -MD -MP -MF $(DEPDIR)/xbb-mem.Tpo -c -o xbb-mem.obj `if test -f 'mem.c'; then $(CYGPATH_W) 'mem.c'; else $(CYGPATH_W) '$(srcdir)/mem.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-mem.Tpo $(DEPDIR)/xbb-mem.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mem.c' object='xbb-mem.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-mem.obj `if test -f 'mem.c'; then $(CYGPATH_W) 'mem.c'; else $(CYGPATH_W) '$(srcdir)/mem.c'; fi`
+
+xbb-mfileio.o: mfileio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-mfileio.o -MD -MP -MF $(DEPDIR)/xbb-mfileio.Tpo -c -o xbb-mfileio.o `test -f 'mfileio.c' || echo '$(srcdir)/'`mfileio.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-mfileio.Tpo $(DEPDIR)/xbb-mfileio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mfileio.c' object='xbb-mfileio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-mfileio.o `test -f 'mfileio.c' || echo '$(srcdir)/'`mfileio.c
+
+xbb-mfileio.obj: mfileio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-mfileio.obj -MD -MP -MF $(DEPDIR)/xbb-mfileio.Tpo -c -o xbb-mfileio.obj `if test -f 'mfileio.c'; then $(CYGPATH_W) 'mfileio.c'; else $(CYGPATH_W) '$(srcdir)/mfileio.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-mfileio.Tpo $(DEPDIR)/xbb-mfileio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mfileio.c' object='xbb-mfileio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-mfileio.obj `if test -f 'mfileio.c'; then $(CYGPATH_W) 'mfileio.c'; else $(CYGPATH_W) '$(srcdir)/mfileio.c'; fi`
+
+xbb-numbers.o: numbers.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-numbers.o -MD -MP -MF $(DEPDIR)/xbb-numbers.Tpo -c -o xbb-numbers.o `test -f 'numbers.c' || echo '$(srcdir)/'`numbers.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-numbers.Tpo $(DEPDIR)/xbb-numbers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='numbers.c' object='xbb-numbers.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-numbers.o `test -f 'numbers.c' || echo '$(srcdir)/'`numbers.c
+
+xbb-numbers.obj: numbers.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbb-numbers.obj -MD -MP -MF $(DEPDIR)/xbb-numbers.Tpo -c -o xbb-numbers.obj `if test -f 'numbers.c'; then $(CYGPATH_W) 'numbers.c'; else $(CYGPATH_W) '$(srcdir)/numbers.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbb-numbers.Tpo $(DEPDIR)/xbb-numbers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='numbers.c' object='xbb-numbers.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xbb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbb-numbers.obj `if test -f 'numbers.c'; then $(CYGPATH_W) 'numbers.c'; else $(CYGPATH_W) '$(srcdir)/numbers.c'; fi`
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
diff --git a/Build/source/texk/dvipdfmx/src/agl.c b/Build/source/texk/dvipdfmx/src/agl.c
index a525003b71a..815ccfd6ed5 100644
--- a/Build/source/texk/dvipdfmx/src/agl.c
+++ b/Build/source/texk/dvipdfmx/src/agl.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/agl.c,v 1.32 2005/07/20 10:41:54 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/agl.c,v 1.33 2007/11/14 02:07:14 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
 
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -70,6 +70,7 @@ agl_new_name (void)
   agln->suffix = NULL;
   agln->n_components = 0;
   agln->alternate = NULL;
+  agln->is_predef = 0;
 
   return agln;
 }
@@ -368,6 +369,9 @@ agl_init_map (void)
 {
   ht_init_table(&aglmap);
   agl_load_listfile(AGL_EXTRA_LISTFILE, 0);
+  if (agl_load_listfile(AGL_PREDEF_LISTFILE, 1) < 0) {
+    WARN("Failed to load AGL file \"%s\"...", AGL_PREDEF_LISTFILE);
+  }
   if (agl_load_listfile(AGL_DEFAULT_LISTFILE, 0) < 0) {
     WARN("Failed to load AGL file \"%s\"...", AGL_DEFAULT_LISTFILE);
   }
@@ -388,7 +392,7 @@ agl_close_map (void)
 #define WBUF_SIZE 1024
 
 int
-agl_load_listfile (const char *filename, int format) /* format unused. */
+agl_load_listfile (const char *filename, int is_predef)
 {
   int   count = 0;
   char *p, *endptr, *nextptr;
@@ -458,6 +462,7 @@ agl_load_listfile (const char *filename, int format) /* format unused. */
     }
 
     agln = agl_normalized_name(name);
+    agln->is_predef = is_predef;
     agln->n_components = n_unicodes;
     for (i = 0; i < n_unicodes; i++) {
       agln->unicodes[i] = unicodes[i];
diff --git a/Build/source/texk/dvipdfmx/src/agl.h b/Build/source/texk/dvipdfmx/src/agl.h
index 00e54a87686..da7f52ca40d 100644
--- a/Build/source/texk/dvipdfmx/src/agl.h
+++ b/Build/source/texk/dvipdfmx/src/agl.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/agl.h,v 1.17 2005/07/07 08:00:31 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/agl.h,v 1.18 2007/11/14 02:07:14 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
 
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -26,6 +26,7 @@
 #define _AGL_H_
 
 #define AGL_DEFAULT_LISTFILE "glyphlist.txt"
+#define AGL_PREDEF_LISTFILE "pdfglyphlist.txt"
 #define AGL_EXTRA_LISTFILE "texglyphlist.txt"
 
 #define AGL_MAX_UNICODES 16
@@ -35,6 +36,7 @@ struct agl_name {
   int   n_components;
   long  unicodes[AGL_MAX_UNICODES];
   struct agl_name *alternate;
+  int   is_predef;
 };
 typedef struct agl_name agl_name;
 
diff --git a/Build/source/texk/dvipdfmx/src/asl_charset.h b/Build/source/texk/dvipdfmx/src/asl_charset.h
deleted file mode 100644
index 91192a62cc7..00000000000
--- a/Build/source/texk/dvipdfmx/src/asl_charset.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/asl_charset.h,v 1.3 2004/01/30 18:34:19 hirata Exp $
-
-    This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
-
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
-    the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
-
-    Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-
-#ifndef _ASL_CHARSET_H_
-#define _ASL_CHARSET_H_
-
-/*
- * Adobe Standard Latin Character Set - from PLRM 3rd. ed.
- *
- * Characters marked as EXT are present in the extended (315-character)
- * Latin character set, but not in the original (229-character) set.
- *
- * This list contains 314 characters, Maybe one character missing.
- *
- * Most of strings are also found in cff_stdstr.h.
- * CFF Standard Strings contains all glyph names from the original ASL
- * character set (plus Expert set). But it does not contains glyph names
- * found only in the extented version.
- *
- */
-
-#ifdef _ENCODINGS_C_
-#define ASL_CHARSET_MAX 314
-static const char *const
-ASL_Charset[ASL_CHARSET_MAX] = {
-  "A",
-  "AE",
-  "Aacute",
-  "Abreve",	/* EXT */
-  "Acircumflex",
-  "Adieresis",
-  "Agrave",
-  "Amacron",	/* EXT */
-  "Aogonek",	/* EXT */
-  "Aring",
-  "Atilde",
-  "B",
-  "C",
-  "Cacute",	/* EXT */
-  "Ccaron",	/* EXT */
-  "Ccedilla",
-  "D",
-  "Dcaron",	/* EXT */
-  "Dcroat",	/* EXT */
-  "Delta",	/* EXT */
-  "E",
-  "Eacute",
-  "Ecaron",	/* EXT */
-  "Ecircumflex",
-  "Edieresis",
-  "Edotaccent",	/* EXT */
-  "Egrave",
-  "Emacron",	/* EXT */
-  "Eogonek",	/* EXT */
-  "Eth",
-  "F",
-  "G",
-  "Gbreve",	/* EXT */
-  "Gcommaaccent",	/* EXT */
-  "H",
-  "I",
-  "Iacute",
-  "Icircumflex",
-  "Idieresis",
-  "Idotaccent",	/* EXT */
-  "Igrave",
-  "Imacron",	/* EXT */
-  "Iogonek",	/* EXT */
-  "J",
-  "K",
-  "Kcommaaccent",	/* EXT */
-  "L",
-  "Lacute",	/* EXT */
-  "Lcaron",	/* EXT */
-  "Lcommaaccent",	/* EXT */
-  "Lslash",
-  "M",
-  "N",
-  "Nacute",	/* EXT */
-  "Ncaron",	/* EXT */
-  "Ncommaaccent",	/* EXT */
-  "Ntilde",
-  "O",
-  "OE",
-  "Oacute",
-  "Ocircumflex",
-  "Odieresis",
-  "Ograve",
-  "Ohungarumlaut",	/* EXT */
-  "Omacron",	/* EXT */
-  "Oslash",
-  "Otilde",
-  "P",
-  "Q",
-  "R",
-  "Racute",	/* EXT */
-  "Rcaron",	/* EXT */
-  "Rcommaaccent",	/* EXT */
-  "S",
-  "Sacute",	/* EXT */
-  "Scaron",
-  "Scedilla",	/* EXT */
-  "Scommaaccent",	/* EXT */
-  "T",
-  "Tcaron",	/* EXT */
-  "Tcommaaccent",	/* EXT */
-  "Thorn",
-  "U",
-  "Uacute",
-  "Ucircumflex",
-  "Udieresis",
-  "Ugrave",
-  "Uhungarumlaut",	/* EXT */
-  "Umacron",	/* EXT */
-  "Uogonek",	/* EXT */
-  "Uring",	/* EXT */
-  "V",
-  "W",
-  "X",
-  "Y",
-  "Yacute",
-  "Ydieresis",
-  "Z",
-  "Zacute",	/* EXT */
-  "Zcaron",
-  "Zdotaccent",	/* EXT */
-  "a",
-  "aacute",
-  "abreve",	/* EXT */
-  "acircumflex",
-  "acute",
-  "adieresis",
-  "ae",
-  "agrave",
-  "amacron",	/* EXT */
-  "ampersand",
-  "aogonek",	/* EXT */
-  "aring",
-  "asciicircum",
-  "asciitilde",
-  "asterisk",
-  "at",
-  "atilde",
-  "b",
-  "backslash",
-  "bar",
-  "braceleft",
-  "braceright",
-  "bracketleft",
-  "bracketright",
-  "breve",
-  "brokenbar",
-  "bullet",
-  "c",
-  "cacute",	/* EXT */
-  "caron",
-  "ccaron",	/* EXT */
-  "ccedilla",
-  "cedilla",
-  "cent",
-  "circumflex",
-  "colon",
-  "comma",
-  "commaaccent",	/* EXT */
-  "copyright",
-  "currency",
-  "d",
-  "dagger",
-  "daggerdbl",
-  "dcaron",	/* EXT */
-  "dcroat",	/* EXT */
-  "degree",
-  "dieresis",
-  "divide",
-  "dollar",
-  "dotaccent",
-  "dotlessi",
-  "e",
-  "eacute",
-  "ecaron",	/* EXT */
-  "ecircumflex",
-  "edieresis",
-  "edotaccent",	/* EXT */
-  "egrave",
-  "eight",
-  "ellipsis",
-  "emacron",	/* EXT */
-  "emdash",
-  "endash",
-  "eogonek",	/* EXT */
-  "equal",
-  "eth",
-  "exclam",
-  "exclamdown",
-  "f",
-  "fi",
-  "five",
-  "fl",
-  "florin",
-  "four",
-  "fraction",
-  "g",
-  "gbreve",	/* EXT */
-  "gcammaaccent",	/* EXT */
-  "germandbls",
-  "grave",
-  "greater",
-  "greaterequal",	/* EXT */
-  "guillemotleft",  /* MISSPELED BY ADOBE */
-  "guillemotright", /* MISSPELED BY ADOBE */
-  "guilsinglleft",
-  "guilsinglright",
-  "h",
-  "hungarumlaut",
-  "hyphen",
-  "i",
-  "iacute",
-  "icircumflex",
-  "idieresis",
-  "igrave",
-  "imacron",	/* EXT */
-  "iogonek",	/* EXT */
-  "j",
-  "k",
-  "kcommaaccent",	/* EXT */
-  "l",
-  "lacute",	/* EXT */
-  "lcaron",	/* EXT */
-  "lcommaaccent",	/* EXT */
-  "less",
-  "lessequal",	/* EXT */
-  "logicalnot",
-  "lozenge",	/* EXT */
-  "lslash",
-  "m",
-  "macron",
-  "minus",
-  "mu",
-  "multiply",
-  "n",
-  "nacute",	/* EXT */
-  "ncaron",	/* EXT */
-  "ncommaaccent",	/* EXT */
-  "nine",
-  "notequal",	/* EXT */
-  "ntilde",
-  "numbersign",
-  "o",
-  "oacute",
-  "ocircumflex",
-  "odieresis",
-  "oe",
-  "ogonek",
-  "ograve",
-  "ohungarumlaut",	/* EXT */
-  "omacron",	/* EXT */
-  "one",
-  "onehalf",
-  "onequarter",
-  "onesuperior",
-  "ordfeminine",
-  "ordmasculine",
-  "oslash",
-  "otilde",
-  "p",
-  "paragraph",
-  "parenleft",
-  "parenright",
-  "partialdiff",	/* EXT */
-  "percent",
-  "period",
-  "periodcentered",
-  "perthousand",
-  "plus",
-  "plusminus",
-  "q",
-  "question",
-  "questiondown",
-  "quotedbl",
-  "quotedblbase",
-  "quotedblleft",
-  "quotedblright",
-  "quoteleft",
-  "quoteright",
-  "quotesinglbase",
-  "quotesingle",
-  "r",
-  "racute",	/* EXT */
-  "radical",	/* EXT */
-  "rcaron",	/* EXT */
-  "rcommaaccent",	/* EXT */
-  "registered",
-  "ring",
-  "s",
-  "scacute",	/* EXT */
-  "scaron",
-  "scedilla",	/* EXT */
-  "scommaaccent",	/* EXT */
-  "section",
-  "semicolon",
-  "seven",
-  "six",
-  "slash",
-  "space",
-  "sterling",
-  "summation",	/* EXT */
-  "t",
-  "tcaron",	/* EXT */
-  "tcommaaccent",	/* EXT */
-  "thorn",
-  "three",
-  "threequarters",
-  "threesuperior",
-  "tilde",
-  "trademark",
-  "two",
-  "twosuperior",
-  "u",
-  "uacute",
-  "ucircumflex",
-  "udieresis",
-  "ugrave",
-  "uhungarumlaut",	/* EXT */
-  "umacron",	/* EXT */
-  "underscore",
-  "uogonek",	/* EXT */
-  "uring",	/* EXT */
-  "v",
-  "w",
-  "x",
-  "y",
-  "yacute",
-  "ydieresis",
-  "yen",
-  "z",
-  "zacute",	/* EXT */
-  "zcaron",
-  "zdotaccent",	/* EXT */
-  "zero"
-};
-#endif /* _ENCODINGS_C_ */
-
-#endif /* _ASL_CHARSET_H_ */
diff --git a/Build/source/texk/dvipdfmx/src/cff_dict.c b/Build/source/texk/dvipdfmx/src/cff_dict.c
index 875210ca090..44f9c24931e 100644
--- a/Build/source/texk/dvipdfmx/src/cff_dict.c
+++ b/Build/source/texk/dvipdfmx/src/cff_dict.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/cff_dict.c,v 1.13 2004/08/26 16:02:26 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/cff_dict.c,v 1.15 2007/07/05 05:45:06 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -430,7 +430,7 @@ static long pack_real (card8 *dest, long destlen, double value)
 {
   long e;
   int i = 0, pos = 2;
-#define CFF_REAL_MAX_LEN 17
+  char buffer[32];
 
   if (destlen < 2)
     ERROR("%s: Buffer overflow.", CFF_DEBUG_STR);
@@ -448,28 +448,19 @@ static long pack_real (card8 *dest, long destlen, double value)
     pos++;
   }
 
-  e = 0;
-  if (value >= 10.0) {
-    while (value >= 10.0) {
-      value /= 10.0;
-      e++;
-    }
-  } else if (value < 1.0) {
-    while (value < 1.0) {
-      value *= 10.0;
-      e--;
-    }
-  }
+  /* To avoid the problem with Mac OS X 10.4 Quartz,
+   * change the presion of the real numbers
+   * on June 27, 2007 for musix20.pfb */
+  sprintf(buffer, "%.13g", value);
 
-  sprintf(work_buffer, "%1.14g", value);
-  for (i=0;i<CFF_REAL_MAX_LEN;i++) {
+  for (i = 0; buffer[i] != '\0'; i++) {
     unsigned char ch = 0;
-    if (work_buffer[i] == '\0') {
-      break;
-    } else if (work_buffer[i] == '.') {
+    if (buffer[i] == '.') {
       ch = 0x0a;
-    } else if (work_buffer[i] >= '0' && work_buffer[i] <= '9') {
-      ch = work_buffer[i] - '0';
+    } else if (buffer[i] >= '0' && buffer[i] <= '9') {
+      ch = buffer[i] - '0';
+    } else if (buffer[i] == 'e') {
+      ch = (buffer[++i] == '-' ? 0x0c : 0x0b);
     } else {
       ERROR("%s: Invalid character.", CFF_DEBUG_STR);
     }
@@ -485,53 +476,6 @@ static long pack_real (card8 *dest, long destlen, double value)
     pos++;
   }
 
-  if (e > 0) {
-    if (pos % 2) {
-      dest[pos/2] += 0x0b;
-    } else {
-      if (destlen < pos/2 + 1)
-	ERROR("%s: Buffer overflow.", CFF_DEBUG_STR);
-      dest[pos/2] = 0xb0;
-    }
-    pos++;
-  } else if (e < 0) {
-    if (pos % 2) {
-      dest[pos/2] += 0x0c;
-    } else {
-      if (destlen < pos/2 + 1)
-	ERROR("%s: Buffer overflow.", CFF_DEBUG_STR);
-      dest[pos/2] = 0xc0;
-    }
-    e *= -1;
-    pos++;
-  }
-
-  if (e != 0) {
-    sprintf(work_buffer, "%ld", e);
-    for (i=0;i<CFF_REAL_MAX_LEN;i++) {
-      unsigned char ch = 0;
-      if (work_buffer[i] == '\0') {
-	break;
-      } else if (work_buffer[i] == '.') {
-	ch = 0x0a;
-      } else if (work_buffer[i] >= '0' && work_buffer[i] <= '9') {
-	ch = work_buffer[i] - '0';
-      } else {
-	ERROR("%s: Invalid character.", CFF_DEBUG_STR);
-      }
-
-      if (destlen < pos/2 + 1)
-	ERROR("%s: Buffer overflow.", CFF_DEBUG_STR);
-
-      if (pos % 2) {
-	dest[pos/2] += ch;
-      } else {
-	dest[pos/2] = (ch << 4);
-      }
-      pos++;
-    }
-  }
-
   if (pos % 2) {
     dest[pos/2] += 0x0f;
     pos++;
diff --git a/Build/source/texk/dvipdfmx/src/cff_dict.h b/Build/source/texk/dvipdfmx/src/cff_dict.h
index 806fc4be50d..7a8d1f888b7 100644
--- a/Build/source/texk/dvipdfmx/src/cff_dict.h
+++ b/Build/source/texk/dvipdfmx/src/cff_dict.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/cff_dict.h,v 1.6 2004/02/15 12:59:42 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/cff_dict.h,v 1.7 2007/06/30 01:18:13 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,6 @@
 #include "cff_types.h"
 #include "cff.h"
 
-#define CFF_CIDCOUNT_DEFAULT      8720
 #define CFF_NOMINALWIDTHX_DEFAULT 0.0
 #define CFF_DEFAULTWIDTHX_DEFAULT 0.0
 
diff --git a/Build/source/texk/dvipdfmx/src/cid_basefont.h b/Build/source/texk/dvipdfmx/src/cid_basefont.h
index 9dd947bcb57..4b87320950f 100644
--- a/Build/source/texk/dvipdfmx/src/cid_basefont.h
+++ b/Build/source/texk/dvipdfmx/src/cid_basefont.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/cid_basefont.h,v 1.14 2005/06/27 11:54:50 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/cid_basefont.h,v 1.15 2007/11/15 17:08:52 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -456,6 +456,32 @@ const struct {
 >> \
      >>"
   },
+
+  /* Addition in Adobe Reader 8 */
+  /*
+   * Font information of AdobeHeitiStd-Regular.otf may not be correct!
+   * Just copied the information of AdobeSongStd-Light.otf.
+   */
+  {
+    "AdobeHeitiStd-Regular",
+    "<< \
+/Subtype/CIDFontType0 \
+/CIDSystemInfo << /Registry (Adobe) /Ordering (GB1) /Supplement 4 >> \
+/DW 1000 \
+/W [\
+  814 939 500 \
+ 7716 [500] \
+22355 [500 500] \
+22357 [500] \
+]\
+>>",
+    "<< \
+/Ascent 880 /Descent -120 /StemV 66 /CapHeight 626 \
+/FontBBox [-134 -254 1001 905] \
+/ItalicAngle 0 /Flags 6 /XHeight 416 \
+/Style << /Panose <000002020300000000000000> >> \
+>>"
+  },
   /* END */
   {NULL, NULL, NULL}
 };
diff --git a/Build/source/texk/dvipdfmx/src/cidtype0.c b/Build/source/texk/dvipdfmx/src/cidtype0.c
index ec88c13b38c..f070cd2fe43 100644
--- a/Build/source/texk/dvipdfmx/src/cidtype0.c
+++ b/Build/source/texk/dvipdfmx/src/cidtype0.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/cidtype0.c,v 1.34 2005/07/17 09:53:37 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/cidtype0.c,v 1.36 2007/06/30 01:18:13 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -182,7 +182,7 @@ add_CIDVMetrics (sfnt *sfont, pdf_obj *fontdict,
     vhea = tt_read_vhea_table(sfont);
   if (vhea && sfnt_find_table_pos(sfont, "vmtx") > 0) {
     sfnt_locate_table(sfont, "vmtx");
-    vmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, vhea->numOfLongVerMetrics);
+    vmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, vhea->numOfLongVerMetrics, vhea->numOfExSideBearings);
   }
   /*
    * OpenType font must have OS/2 table.
@@ -312,7 +312,7 @@ add_CIDMetrics (sfnt *sfont, pdf_obj *fontdict,
   hhea = tt_read_hhea_table(sfont);
 
   sfnt_locate_table(sfont, "hmtx");
-  hmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, hhea->numberOfHMetrics);
+  hmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, hhea->numOfLongHorMetrics, hhea->numOfExSideBearings);
 
   add_CIDHMetrics(sfont, fontdict, CIDToGIDMap, last_cid, maxp, head, hmtx);
   if (need_vmetrics)
@@ -472,8 +472,8 @@ CIDFont_type0_dofont (CIDFont *font)
   long   size, offset = 0;
   card8 *data;
   card16 num_glyphs, gid;
-  long   cid;
-  card16 cid_count, cs_count, last_cid;
+  long   cid, cid_count;
+  card16 cs_count, last_cid;
   int    fd, prev_fd, parent_id;
   char  *used_chars;
   unsigned char *CIDToGIDMap = NULL;
@@ -526,9 +526,9 @@ CIDFont_type0_dofont (CIDFont *font)
     ERROR("Not a CIDFont.");
 
   if (cff_dict_known(cffont->topdict, "CIDCount")) {
-    cid_count = (card16) cff_dict_get(cffont->topdict, "CIDCount", 0);
+    cid_count = (long) cff_dict_get(cffont->topdict, "CIDCount", 0);
   } else {
-    cid_count = CFF_CIDCOUNT_DEFAULT;
+    cid_count = CID_MAX + 1;
   }
 
   cff_read_charsets(cffont);
@@ -538,11 +538,6 @@ CIDFont_type0_dofont (CIDFont *font)
   cid = 0; last_cid = 0; num_glyphs = 0;
   for (cid = 0; cid <= CID_MAX; cid++) {
     if (is_used_char2(used_chars, cid)) {
-      if (cid >= cid_count) {
-	WARN("Glyph for CID %u missing in font \"%s\".", (CID) cid, font->ident);
-	used_chars[cid/8] &= ~(1 << (7 - (cid % 8)));
-	continue;
-      }
       gid = cff_charsets_lookup(cffont, cid);
       if (cid != 0 && gid == 0) {
 	WARN("Glyph for CID %u missing in font \"%s\".", (CID) cid, font->ident);
diff --git a/Build/source/texk/dvipdfmx/src/dpxfile.c b/Build/source/texk/dvipdfmx/src/dpxfile.c
index 295e4d2f4fd..195bb4faa8c 100644
--- a/Build/source/texk/dvipdfmx/src/dpxfile.c
+++ b/Build/source/texk/dvipdfmx/src/dpxfile.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/dpxfile.c,v 1.14 2005/12/18 14:56:47 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/dpxfile.c,v 1.16 2007/11/14 03:36:01 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -323,7 +323,7 @@ dpx_open_file (const char *filename, int type)
   }
   if (fqpn) {
     fp = MFOPEN(fqpn, FOPEN_RBIN_MODE);
-    RELEASE(fqpn);
+    free(fqpn);  /* no RELEASE because not allocated by NEW */
   }
 
   return  fp;
@@ -523,9 +523,9 @@ dpx_find_enc_file (const char *filename)
   }
 #else
 # if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
-  fqpn = kpse_find_file(filename, kpse_enc_format, 0);
+  fqpn = kpse_find_file(q, kpse_enc_format, 0);
 # else
-  fqpn = kpse_find_file(filename, kpse_tex_ps_header_format, 0);
+  fqpn = kpse_find_file(q, kpse_tex_ps_header_format, 0);
 # endif
 #endif /* MIKTEX */
 
diff --git a/Build/source/texk/dvipdfmx/src/dpxutil.c b/Build/source/texk/dvipdfmx/src/dpxutil.c
index 2b0cf946b79..c87568b96a5 100644
--- a/Build/source/texk/dvipdfmx/src/dpxutil.c
+++ b/Build/source/texk/dvipdfmx/src/dpxutil.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/dpxutil.c,v 1.7 2005/07/17 09:53:38 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/dpxutil.c,v 1.8 2007/11/14 03:36:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -235,9 +235,10 @@ ht_lookup_table (struct ht_table *ht, const void *key, int keylen)
   return NULL;
 }
 
-void
+int
 ht_remove_table (struct ht_table *ht,
 		 const void *key, int keylen, void (*hval_free_fn) (void *))
+/* returns 1 if the element was found and removed and 0 otherwise */
 {
   struct ht_entry *hent, *prev;
   unsigned int     hkey;
@@ -269,7 +270,9 @@ ht_remove_table (struct ht_table *ht,
     }
     RELEASE(hent);
     ht->count--;
-  }
+    return 1;
+  } else
+    return 0;
 }
 
 /* replace... */
diff --git a/Build/source/texk/dvipdfmx/src/dpxutil.h b/Build/source/texk/dvipdfmx/src/dpxutil.h
index 54fc8e8cd09..09a755c22b8 100644
--- a/Build/source/texk/dvipdfmx/src/dpxutil.h
+++ b/Build/source/texk/dvipdfmx/src/dpxutil.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/dpxutil.h,v 1.7 2005/07/17 09:53:38 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/dpxutil.h,v 1.8 2007/11/14 03:36:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -76,7 +76,7 @@ extern void  ht_clear_table  (struct ht_table *ht, void (*hval_free_fn) (void *)
 extern void *ht_lookup_table (struct ht_table *ht, const void *key, int keylen);
 extern void  ht_append_table (struct ht_table *ht,
 			      const void *key, int keylen, void *value) ;
-extern void  ht_remove_table (struct ht_table *ht,
+extern int   ht_remove_table (struct ht_table *ht,
 			      const void *key, int keylen, void (*hval_free_fn) (void*));
 extern void  ht_insert_table (struct ht_table *ht,
 			      const void *key, int keylen, void *value,
diff --git a/Build/source/texk/dvipdfmx/src/dvipdfmx.c b/Build/source/texk/dvipdfmx/src/dvipdfmx.c
index de113ac8386..3c9e043c4a7 100644
--- a/Build/source/texk/dvipdfmx/src/dvipdfmx.c
+++ b/Build/source/texk/dvipdfmx/src/dvipdfmx.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/dvipdfmx.c,v 1.47 2006/12/11 13:23:26 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/dvipdfmx.c,v 1.53 2007/11/14 03:36:01 chofchof Exp $
     
     This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks.
 
-    Copyright (C) 2002-2003 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the DVIPDFMx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -65,6 +65,9 @@ static long opt_flags = 0;
 #define OPT_TPIC_TRANSPARENT_FILL (1 << 1)
 #define OPT_CIDFONT_FIXEDPITCH    (1 << 2)
 #define OPT_FONTMAP_FIRST_MATCH   (1 << 3)
+#define OPT_NO_OBJSTM             (1 << 4)
+
+static int    do_objstm;
 
 static char   ignore_colors = 0;
 static double annot_grow    = 0.0;
@@ -123,7 +126,7 @@ usage (void)
 {
   fprintf (stdout, "\nThis is %s-%s by the DVIPDFMx project team,\n", PACKAGE, VERSION);
   fprintf (stdout, "an extended version of dvipdfm-0.13.2c developed by Mark A. Wicks.\n");
-  fprintf (stdout, "\nCopyright (C) 2002-2006 by the DVIPDFMx project team\n");
+  fprintf (stdout, "\nCopyright (C) 2002-2007 by the DVIPDFMx project team\n");
   fprintf (stdout, "\nThis is free software; you can redistribute it and/or modify\n");
   fprintf (stdout, "it under the terms of the GNU General Public License as published by\n");
   fprintf (stdout, "the Free Software Foundation; either version 2 of the License, or\n");
@@ -131,38 +134,47 @@ usage (void)
   fprintf (stdout, "\nUsage: dvipdfmx [options] dvifile\n");
   fprintf (stdout, "-c \t\tIgnore color specials (for B&W printing)\n");
   fprintf (stdout, "-d number\tSet PDF decimal digits (0-5) [2]\n");
-  fprintf (stdout, "-l \t\tLandscape mode\n");
 #if 0
   /* Not supported */
   fprintf (stdout, "-e \t\tDisable partial font embedding [default is enabled]\n");
 #endif
   fprintf (stdout, "-f filename\tSet font map file name [t1fonts.map]\n");
+  fprintf (stdout, "-g dimension\tAnnotation \"grow\" amount [0.0in]\n");
+  fprintf (stdout, "-l \t\tLandscape mode\n");
   fprintf (stdout, "-m number\tSet additional magnification\n");
   fprintf (stdout, "-o filename\tSet output file name [dvifile.pdf]\n");
   fprintf (stdout, "-p papersize\tSet papersize [a4]\n");
+  fprintf (stdout, "-q \t\tBe quiet\n");
   fprintf (stdout, "-r resolution\tSet resolution (in DPI) for raster fonts [600]\n");
   fprintf (stdout, "-s pages\tSelect page ranges (-)\n");
+#ifndef NO_THUMBNAIL
   fprintf (stdout, "-t \t\tEmbed thumbnail images\n");
+#endif /* !NO_THUMBNAIL */
   fprintf (stdout, "-x dimension\tSet horizontal offset [1.0in]\n");
   fprintf (stdout, "-y dimension\tSet vertical offset [1.0in]\n");
   fprintf (stdout, "-z number  \tSet zlib compression level (0-9) [9]\n");
 
-  fprintf (stdout, "-v         \tBe verbose\n");
-  fprintf (stdout, "-vv        \tBe more verbose\n");
+  fprintf (stdout, "-v \t\tBe verbose\n");
+  fprintf (stdout, "-vv\t\tBe more verbose\n");
   fprintf (stdout, "-C number\tSpecify miscellaneous option flags [0]:\n");
   fprintf (stdout, "\t\t  0x0001 reserved\n");
   fprintf (stdout, "\t\t  0x0002 Use semi-transparent filling for tpic shading command,\n");
-  fprintf (stdout, "\t\t         instead of opaque gray color. (requires PDF 1.4)\n");
+  fprintf (stdout, "\t\t\t instead of opaque gray color. (requires PDF 1.4)\n");
   fprintf (stdout, "\t\t  0x0004 Treat all CIDFont as fixed-pitch font.\n");
   fprintf (stdout, "\t\t  0x0008 Do not replace duplicate fontmap entries.\n");
+  fprintf (stdout, "\t\t  0x0010 Do not create object streams.\n");
   fprintf (stdout, "\t\tPositive values are always ORed with previously given flags.\n");
   fprintf (stdout, "\t\tAnd negative values replace old values.\n");
+  fprintf (stdout, "-D template\tPS->PDF conversion command line template [none]\n");
+  fprintf (stdout, "-K number\tEncryption key bits [40]\n");
+  fprintf (stdout, "-M \t\tExperimental mps-to-pdf mode\n");
   fprintf (stdout, "-O number\tSet maximum depth of open bookmark items [0]\n");
   fprintf (stdout, "-P number\tSet permission flags for PDF encryption [0x003C]\n");
-  fprintf (stdout, "-S         \tEnable PDF encryption\n");
-  fprintf (stdout, "-T         \tEmbed thumbnail images. Remove images files when finished.\n");
-  fprintf (stdout, "-M         \tExperimental mps-to-pdf mode\n");
-  fprintf (stdout, "-V number\tSet PDF minor version [3]\n");
+  fprintf (stdout, "-S \t\tEnable PDF encryption\n");
+#ifndef NO_THUMBNAIL
+  fprintf (stdout, "-T \t\tEmbed thumbnail images. Remove images files when finished.\n");
+#endif /* !NO_THUMBNAIL */
+  fprintf (stdout, "-V number\tSet PDF minor version [4]\n");
   fprintf (stdout, "\nAll dimensions entered on the command line are \"true\" TeX dimensions.\n");
   fprintf (stdout, "Argument of \"-s\" lists physical page ranges separated by commas, e.g., \"-s 1-3,5-6\"\n");
   fprintf (stdout, "Papersize is specified by paper format (e.g., \"a4\") or by w<unit>,h<unit> (e.g., \"20cm,30cm\").\n");
@@ -416,9 +428,9 @@ do_args (int argc, char *argv[])
           ver_minor = atoi(argv[1]);
           POP_ARG();
         }
-        if (ver_minor < 3 || ver_minor > 5) {
-          WARN("PDF version 1.%d not supported. (1.3 used instead)", ver_minor);
-          ver_minor = 3;
+        if (ver_minor < 3 || ver_minor > 6) {
+          WARN("PDF version 1.%d not supported. (1.4 used instead)", ver_minor);
+          ver_minor = 4;
         }
         pdf_set_version((unsigned) ver_minor);
       }
@@ -654,7 +666,6 @@ do_dvi_pages (void)
   mediabox.urx = paper_width;
   mediabox.ury = paper_height;
 
-  pdf_doc_set_creator (dvi_comment());
   pdf_doc_set_mediabox(0, &mediabox); /* Root node */
 
   for (i = 0; i < num_page_ranges; i++) {
@@ -773,6 +784,8 @@ main (int argc, char *argv[])
 {
   double dvi2pts;
 
+  mem_debug_init();
+
   if (argc < 2) {
     fprintf(stderr, "No dvi filename specified.");
     usage();
@@ -823,10 +836,14 @@ main (int argc, char *argv[])
 
   if (do_encryption) {
     pdf_enc_set_passwd(key_bits, permission, dvi_filename, pdf_filename);
-    if (key_bits > 40)
+    if (key_bits > 40 && pdf_get_version() < 4)
       pdf_set_version(4);
   }
 
+  do_objstm = !(opt_flags & OPT_NO_OBJSTM);
+
+  pdf_doc_set_creator(dvi_comment());
+
   if (mp_mode) {
     x_offset = 0.0;
     y_offset = 0.0;
@@ -847,7 +864,7 @@ main (int argc, char *argv[])
    * annot_grow:    Margin of annotation.
    * bookmark_open: Miximal depth of open bookmarks.
    */
-  pdf_open_document(pdf_filename,
+  pdf_open_document(pdf_filename, do_encryption, do_objstm,
                     paper_width, paper_height, annot_grow, bookmark_open);
 
   /* Ignore_colors placed here since
@@ -886,5 +903,7 @@ main (int argc, char *argv[])
   miktex_uninitialize ();
 #endif
 
+  mem_debug_check();
+
   return 0;
 }
diff --git a/Build/source/texk/dvipdfmx/src/epdf.c b/Build/source/texk/dvipdfmx/src/epdf.c
index 83bfcfbbb09..1cb621a4149 100644
--- a/Build/source/texk/dvipdfmx/src/epdf.c
+++ b/Build/source/texk/dvipdfmx/src/epdf.c
@@ -1,28 +1,27 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/epdf.c,v 1.14 2004/09/12 11:57:49 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/epdf.c,v 1.16 2007/11/14 03:12:21 chofchof Exp $
 
-    This is dvipdfm, a DVI to PDF translator.
-    Copyright (C) 1998, 1999 by Mark A. Wicks
+    This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
+
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
+    the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
+    
+    Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
-
+    
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-
+    
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-    
-    The author may be contacted via the e-mail address
-
-	mwicks@kettering.edu
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 */
 
-
 /*
  * Concatinating content streams are only supported for streams that only uses
  * single FlateDecode filter, i.e.,
@@ -60,44 +59,55 @@ static void print_bbox_info  (pdf_obj *rect, const char *type, pdf_obj *crop_box
 static int  rect_equal       (pdf_obj *rect1, pdf_obj *rect2);
 
 /*
- * From PDF Reference 4th ed.
+ * From PDFReference15_v6.pdf (p.119 and p.834)
  *
- *  MediaBox rectangle (Required; inheritable)
+ * MediaBox rectangle (Required; inheritable)
  *
- *   A rectangle, expressed in default user space units, defining the boundaries of the
- *   physical medium on which the page is intended to be displayed or printed.
+ * The media box defines the boundaries of the physical medium on which the
+ * page is to be printed. It may include any extended area surrounding the
+ * finished page for bleed, printing marks, or other such purposes. It may
+ * also include areas close to the edges of the medium that cannot be marked
+ * because of physical limitations of the output device. Content falling
+ * outside this boundary can safely be discarded without affecting the
+ * meaning of the PDF file.
  *
- *  CropBox rectangle (Optional; inheritable)
+ * CropBox rectangle (Optional; inheritable)
  *
- *    A rectangle, expressed in default user space units, defining the visible region of
- *    default user space. When the page is displayed or printed, its contents are to be
- *    clipped (cropped) to this rectangle and then imposed on the output medium in some
- *    implementation-defined manner.
- *    Default value: the value of MediaBox.
+ * The crop box defines the region to which the contents of the page are to be
+ * clipped (cropped) when displayed or printed. Unlike the other boxes, the
+ * crop box has no defined meaning in terms of physical page geometry or
+ * intended use; it merely imposes clipping on the page contents. However,
+ * in the absence of additional information (such as imposition instructions
+ * specified in a JDF or PJTF job ticket), the crop box will determine how
+ * the page’s contents are to be positioned on the output medium. The default
+ * value is the page’s media box. 
  *
- *  BleedBox rectangle (Optional; PDF 1.3)
+ * BleedBox rectangle (Optional; PDF 1.3)
  *
- *    A rectangle, expressed in default user space units, defining the region to which the
- *    contents of the page should be clipped when output in a production environment.
- *    Default value: the value of CropBox.
+ * The bleed box (PDF 1.3) defines the region to which the contents of the
+ * page should be clipped when output in a production environment. This may
+ * include any extra “bleed area” needed to accommodate the physical
+ * limitations of cutting, folding, and trimming equipment. The actual printed
+ * page may include printing marks that fall outside the bleed box.
+ * The default value is the page’s crop box. 
  *
- *  TrimBox rectangle (Optional; PDF 1.3)
+ * TrimBox rectangle (Optional; PDF 1.3)
  *
- *    A rectangle, expressed in default user space units, defining the intended dimensions
- *    of the finished page after trimming.
- *    Default value: the value of CropBox.
+ * The trim box (PDF 1.3) defines the intended dimensions of the finished page
+ * after trimming. It may be smaller than the media box, to allow for
+ * production-related content such as printing instructions, cut marks, or
+ * color bars. The default value is the page’s crop box. 
  *
- *  ArtBox rectangle (Optional; PDF 1.3)
+ * ArtBox rectangle (Optional; PDF 1.3)
  *
- *    A rectangle, expressed in default user space units, defining the extent of the page's
- *    meaningful content (including potential white space) as intended by the page's creator
- *    Default value: the value of CropBox.
+ * The art box (PDF 1.3) defines the extent of the page’s meaningful content
+ * (including potential white space) as intended by the page’s creator.
+ * The default value is the page’s crop box.
  *
- *  Rotate integer (Optional; inheritable)
+ * Rotate integer (Optional; inheritable)
  *
- *    The number of degrees by which the page should be rotated clockwise when displayed or
- *    printed. The value must be a multiple of 90.
- *    Default value: 0.
+ * The number of degrees by which the page should be rotated clockwise when
+ * displayed or printed. The value must be a multiple of 90. Default value: 0.
  */
 
 static int
@@ -222,6 +232,27 @@ pdf_include_page (pdf_ximage *ximage, FILE *image_file)
 	  pdf_release_obj(bbox);
 	bbox = tmp;
       }
+      if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "BleedBox")))) {
+        if (!rect_equal(tmp, bbox)) {
+	  if (bbox)
+	    pdf_release_obj(bbox);
+	  bbox = tmp;
+        }
+      }
+      if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "TrimBox")))) {
+        if (!rect_equal(tmp, bbox)) {
+	  if (bbox)
+	    pdf_release_obj(bbox);
+	  bbox = tmp;
+        }
+      }
+      if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "ArtBox")))) {
+        if (!rect_equal(tmp, bbox)) {
+	  if (bbox)
+	    pdf_release_obj(bbox);
+	  bbox = tmp;
+        }
+      }
       if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "CropBox")))) {
 	if (crop_box)
 	  pdf_release_obj(crop_box);
@@ -246,6 +277,7 @@ pdf_include_page (pdf_ximage *ximage, FILE *image_file)
       bbox = crop_box;
     }
   }
+
   if (!bbox) {
     WARN("No BoundingBox information available.");
     pdf_release_obj(page_tree);
@@ -256,49 +288,18 @@ pdf_include_page (pdf_ximage *ximage, FILE *image_file)
     return -1;
   }
 
-  /*
-   * BleedBox, TrimBox, and ArtBox are not inheritable.
-   */
-  {
-    pdf_obj *tmp;
-
-    if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "TrimBox")))) {
-      if (!rect_equal(tmp, bbox)) {
-	print_bbox_info(tmp, "TrimBox", bbox);
-	if (bbox)
-	  pdf_release_obj(bbox);
-	bbox = tmp;
-      }
-    }
-    if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "BleedBox")))) {
-      if (!rect_equal(tmp, bbox)) {
-	print_bbox_info(tmp, "BleedBox", bbox);
-	if (bbox)
-	  pdf_release_obj(bbox);
-	bbox = tmp;
-      }
-    }
-    if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "ArtBox")))) {
-      if (!rect_equal(tmp, bbox)) {
-	print_bbox_info(tmp, "ArtBox", bbox);
-	if (bbox)
-	  pdf_release_obj(bbox);
-	bbox = tmp;
-      }
-    }
-    if (rotate) {
-      if (pdf_number_value(rotate) != 0.0)
-	WARN("<< /Rotate %d >> found. (Not supported yet)",  (int)pdf_number_value(rotate));
-      pdf_release_obj(rotate);
-      rotate = NULL;
-    }
-
-    info.bbox.llx = pdf_number_value(pdf_get_array(bbox, 0));
-    info.bbox.lly = pdf_number_value(pdf_get_array(bbox, 1));
-    info.bbox.urx = pdf_number_value(pdf_get_array(bbox, 2));
-    info.bbox.ury = pdf_number_value(pdf_get_array(bbox, 3));
+  if (rotate) {
+    if (pdf_number_value(rotate) != 0.0)
+      WARN("<< /Rotate %d >> found. (Not supported yet)",  (int)pdf_number_value(rotate));
+    pdf_release_obj(rotate);
+    rotate = NULL;
   }
 
+  info.bbox.llx = pdf_number_value(pdf_get_array(bbox, 0));
+  info.bbox.lly = pdf_number_value(pdf_get_array(bbox, 1));
+  info.bbox.urx = pdf_number_value(pdf_get_array(bbox, 2));
+  info.bbox.ury = pdf_number_value(pdf_get_array(bbox, 3));
+
   /*
    * Handle page content stream.
    * page_tree is now set to the first page.
diff --git a/Build/source/texk/dvipdfmx/src/fontmap.c b/Build/source/texk/dvipdfmx/src/fontmap.c
index 041021ba9ff..f55e4a9a738 100644
--- a/Build/source/texk/dvipdfmx/src/fontmap.c
+++ b/Build/source/texk/dvipdfmx/src/fontmap.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/fontmap.c,v 1.33 2005/07/30 11:44:18 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/fontmap.c,v 1.36 2007/11/14 03:36:01 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -738,8 +738,11 @@ pdf_insert_fontmap_record (const char *kp, const fontmap_rec *vp)
     char **subfont_ids;
     int    n = 0;
     subfont_ids = sfd_get_subfont_ids(sfd_name, &n);
-    if (!subfont_ids)
+    if (!subfont_ids) {
+      RELEASE(fnt_name);
+      RELEASE(sfd_name);
       return  -1;
+    }
     if (verbose > 3)
       MESG("\nfontmap>> Expand @%s@:", sfd_name);
     while (n-- > 0) {
@@ -1039,6 +1042,8 @@ pdf_close_fontmaps (void)
     RELEASE(fontmap);
   }
   fontmap = NULL;
+
+  release_sfd_record();
 }
 
 void
diff --git a/Build/source/texk/dvipdfmx/src/jpegimage.c b/Build/source/texk/dvipdfmx/src/jpegimage.c
index 65cde6c9a26..c605394311e 100644
--- a/Build/source/texk/dvipdfmx/src/jpegimage.c
+++ b/Build/source/texk/dvipdfmx/src/jpegimage.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/jpegimage.c,v 1.8 2004/09/05 13:30:05 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/jpegimage.c,v 1.9 2007/05/18 05:19:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -331,6 +331,32 @@ jpeg_include_image (pdf_ximage *ximage, FILE *fp)
   info.bits_per_component = j_info.bits_per_component;
   info.num_components     = j_info.num_components;
 
+#define IS_JFIF(j) ((j).flags & HAVE_APPn_JFIF)
+  if (IS_JFIF(j_info)) {
+    struct JPEG_APPn_JFIF *app_data;
+    int i;
+    for (i = 0; i < j_info.num_appn; i++) {
+      if (j_info.appn[i].marker  != JM_APP0 ||
+	  j_info.appn[i].app_sig != JS_APPn_JFIF)
+        continue;
+    }
+    if (i < j_info.num_appn) {
+      app_data = (struct JPEG_APPn_JFIF *)j_info.appn[i].app_data;
+      switch (app_data->units) {
+      case 1: /* pixels per inch */
+        info.xdensity = 72.0 / app_data->Xdensity;
+        info.ydensity = 72.0 / app_data->Ydensity;
+        break;
+      case 2: /* pixels per centimeter */
+        info.xdensity = 72.0 / 2.54 / app_data->Xdensity;
+        info.ydensity = 72.0 / 2.54 / app_data->Ydensity;
+        break;
+      default:
+        break;
+      }
+    }
+  }
+
   pdf_ximage_set_image(ximage, &info, stream);
   JPEG_info_clear(&j_info);
 
diff --git a/Build/source/texk/dvipdfmx/src/mem.c b/Build/source/texk/dvipdfmx/src/mem.c
index 382f0dd8e81..ecc42c6321c 100644
--- a/Build/source/texk/dvipdfmx/src/mem.c
+++ b/Build/source/texk/dvipdfmx/src/mem.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/mem.c,v 1.3 2002/10/30 02:27:11 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/mem.c,v 1.4 2007/11/14 03:36:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -25,24 +25,69 @@
 #include <stdio.h>	
 #include <stdlib.h>
 
+#include "dpxutil.h"
 #include "mem.h"
 
+static long int mem_count = 0;
+static int mem_internal = 0;
+static struct ht_table *mem_ht = NULL;
+
 #ifdef MEM_DEBUG
-FILE *debugfile = NULL;
-static long int event = 0;
+
+#define MEM_LINE   128
+
+long int mem_event = 0;
+
+static void
+mem_noop (void *vp)
+{
+}
+
+static void
+mem_error (void *vp)
+{
+  fprintf(stderr, "pointer %p released, but not allocated\n", vp);
+}
+
 #endif /* MEM_DEBUG */
 
-#ifdef MEM_DEBUG
-void mem_debug_init(void)
+void mem_debug_check(void)
 {
-  if (debugfile == NULL) {
-    debugfile = fopen ("malloc.log", "w");
-    fprintf (stderr, "*** Memory Debugging Log started ***\n");
+#ifdef MEM_DEBUG
+  struct ht_iter iter;
+
+  fprintf(stderr, "*** Memory still in use ***\n");
+
+  if (ht_set_iter(mem_ht, &iter) == 0) {
+    do {
+      int pl;
+      void *p = ht_iter_getkey(&iter, &pl);
+      char *s = ht_iter_getval(&iter);
+
+      fprintf(stderr, "%p %s\n", p, s);
+    } while (!ht_iter_next(&iter));
   }
+  ht_clear_iter(&iter);
+
+  fprintf(stderr, "*** End of used memory ***\n");
+#endif /* MEM_DEBUG */
+
+  if (mem_count)
+    fprintf(stderr, "*** WARNING: %ld memory objects still allocated\n", mem_count);
 }
+
+void mem_debug_init(void)
+{
+#ifdef MEM_DEBUG
+  mem_ht = malloc(sizeof(struct ht_table));
+  ht_init_table(mem_ht);
+  fprintf(stderr, "*** Memory debugging started ***\n");
+#else
+  mem_ht = (struct ht_table *) &mem_count; /* just any non-null value */
 #endif /* MEM_DEBUG */
+}
 
-void *new (size_t size, char *function, int line)
+void *new (size_t size, const char *file, const char *function, int line)
 {
   void *result;
   if ((result = malloc (size)) == NULL) {
@@ -51,44 +96,107 @@ void *new (size_t size, char *function, int line)
     exit (1);
   }
 
-#ifdef MEM_DEBUG  
-  mem_debug_init();
-  event += 1;
-  fprintf (debugfile, "%p %07ld [new] %s:%d\n", result, event, function, line);
+  if (!mem_internal) {
+    mem_count++;
+#ifdef MEM_DEBUG
+    mem_internal = 1;
+    char *s = malloc(MEM_LINE), **p = malloc(sizeof(result));
+    *p = result;
+    snprintf(s, MEM_LINE, "(0x%08lx) %s (%s, %d)"
+#ifdef __GNUC__
+            ", called from %p"
+#endif
+            , ++mem_event, function, file, line
+#ifdef __GNUC__
+            , __builtin_return_address(1)
+#endif
+            );
+    ht_insert_table(mem_ht, p, sizeof(result), s, mem_error);
+    mem_internal = 0;
 #endif /* MEM_DEBUG */
+  }
 
   return result;
 }
 
-void *renew (void *mem, size_t size, char *function, int line)
+void *renew (void *mem, size_t size, const char *file, const char *function, int line)
 {
   void *result;
+
+  if (!mem_internal) {
+    if (!mem)
+      mem_count++;
 #ifdef MEM_DEBUG
-    mem_debug_init();
-    event += 1;
-  if (mem)
-    fprintf (debugfile, "%p %07ld [fre] %s:%d\n", mem,
-	     event, function, line);
+    else {
+      mem_internal = 1;
+      if (!(mem_ht && ht_remove_table(mem_ht, &mem, sizeof(mem), mem_noop))) {
+	fprintf(stderr, "*** ERROR: Trying to re-allocate non-allocated memory\n");
+	fprintf(stderr, "%p %s (%s, %d)"
+#ifdef __GNUC__
+		", called from %p"
+#endif
+		"\n", mem, function, file, line
+#ifdef __GNUC__
+		, __builtin_return_address(1)
+#endif
+		);
+	exit(1);
+      }
+      mem_internal = 0;
+    }
 #endif /* MEM_DEBUG */
+  }
+
   if ((result = realloc (mem, size)) == NULL) {
     fprintf (stderr, "Out of memory!\n");
     exit (1);
   }
+
 #ifdef MEM_DEBUG
-  if (result)
-    fprintf (debugfile, "%p %07ld [new] %s:%d\n", result, event, function, line);
+  if (!mem_internal) {
+    mem_internal = 1;
+    char *s = malloc(MEM_LINE), **p = malloc(sizeof(result));
+    *p = result;
+    snprintf(s, MEM_LINE, "(0x%08lx) %s (%s, %d)"
+#ifdef __GNUC__
+            ", called from %p"
+#endif
+            , ++mem_event, function, file, line
+#ifdef __GNUC__
+            , __builtin_return_address(1)
+#endif
+            );
+    ht_insert_table(mem_ht, p, sizeof(result), s, mem_error);
+    mem_internal = 0;
+  }
 #endif /* MEM_DEBUG */
+
   return result;
 }
 
-void release (void *mem, char *function, int line)
+void release (void *mem, const char *file, const char *function, int line)
 {
 
+  if (mem && !mem_internal) {
+      mem_count--;
 #ifdef MEM_DEBUG
-    mem_debug_init();
-    event += 1;
-    fprintf (debugfile, "%p %07ld [fre] %s:%d\n", mem, event, function, line);
+      mem_internal = 1;
+      if (!(mem_ht && ht_remove_table(mem_ht, &mem, sizeof(mem), mem_noop))) {
+	fprintf(stderr, "*** ERROR: Trying to free non-allocated memory\n");
+	fprintf(stderr, "%p %s (%s, %d)"
+#ifdef __GNUC__
+		", called from %p"
+#endif
+		"\n", mem, function, file, line
+#ifdef __GNUC__
+		, __builtin_return_address(1)
+#endif
+		);
+	exit(1);
+      }
+      mem_internal = 0;
 #endif /* MEM_DEBUG */
+  }
 
   free (mem);
 }
diff --git a/Build/source/texk/dvipdfmx/src/mem.h b/Build/source/texk/dvipdfmx/src/mem.h
index da690d4c588..90e9db7da7a 100644
--- a/Build/source/texk/dvipdfmx/src/mem.h
+++ b/Build/source/texk/dvipdfmx/src/mem.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/mem.h,v 1.3 2002/10/30 02:27:11 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/mem.h,v 1.4 2007/11/14 03:36:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -25,26 +25,31 @@
 #ifndef _MEM_H_
 #define _MEM_H_
 
+#undef MEM_DEBUG
+
 #include <stdlib.h>
 
-extern void *new (size_t size, char *function, int line);
-extern void *renew (void *p, size_t size, char *function, int line);
-extern void release (void *mem, char *function, int line);
+extern void *new (size_t size, const char *file, const char *function, int line);
+extern void *renew (void *p, size_t size, const char *file, const char *function, int line);
+extern void release (void *mem, const char *file, const char *function, int line);
 
-#ifdef MEM_DEBUG
 extern void mem_debug_init(void);
-extern FILE *debugfile;
-#define NEW(n,type) (type *)(new (((size_t) (n))*sizeof(type),__FUNCTION__,__LINE__))
-#define RENEW(p,n,type) (type *)(renew ((p),(n)*sizeof(type),__FUNCTION__,__LINE__))
-#define RELEASE(p) release ((p),__FUNCTION__,__LINE__)
-#define MEM_START {mem_debug_init();fprintf (debugfile, "Entered %s\n", __FUNCTION__);}
-#define MEM_END fprintf (debugfile, "Leaving %s\n", __FUNCTION__);
+extern void mem_debug_check(void);
+
+#ifdef MEM_DEBUG
+#include <stdio.h>
+extern long int mem_event;
+#define NEW(n,type) (type *)(new (((size_t) (n))*sizeof(type),__FILE__,__FUNCTION__,__LINE__))
+#define RENEW(p,n,type) (type *)(renew ((p),(n)*sizeof(type),__FILE__,__FUNCTION__,__LINE__))
+#define RELEASE(p) release ((p),__FILE__,__FUNCTION__,__LINE__)
+#define MEM_START {mem_debug_init();fprintf (stderr, "Entered %s\n", __FUNCTION__);}
+#define MEM_END fprintf (stderr, "Leaving %s\n", __FUNCTION__);
 #else /* MEM_DEBUG */
 #define MEM_START
 #define MEM_END
-#define NEW(n,type) (type *)(new (((size_t) (n))*sizeof(type),NULL,0))
-#define RENEW(p,n,type) (type *)(renew ((p),(n)*sizeof(type),NULL,0))
-#define RELEASE(p) release ((p),NULL,0)
+#define NEW(n,type) (type *)(new (((size_t) (n))*sizeof(type),NULL,NULL,0))
+#define RENEW(p,n,type) (type *)(renew ((p),(n)*sizeof(type),NULL,NULL,0))
+#define RELEASE(p) release ((p),NULL,NULL,0)
 #endif /* MEM_DEBUG */
 
 #endif /* _MEM_H_ */
diff --git a/Build/source/texk/dvipdfmx/src/mpost.c b/Build/source/texk/dvipdfmx/src/mpost.c
index 6875d5d573e..c3bb35410a5 100644
--- a/Build/source/texk/dvipdfmx/src/mpost.c
+++ b/Build/source/texk/dvipdfmx/src/mpost.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/mpost.c,v 1.36 2006/12/11 12:46:03 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/mpost.c,v 1.37 2007/11/03 05:31:20 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
 
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -260,7 +260,8 @@ skip_prolog (char **start, char *end)
 
   save = *start;
   while (*start < end) {
-    skip_white(start, end);
+    if (**start != '%')
+      skip_white(start, end);
     if (*start >= end)
       break;
     if (!strncmp(*start, "%%EndProlog", 11)) {
diff --git a/Build/source/texk/dvipdfmx/src/pdfdoc.c b/Build/source/texk/dvipdfmx/src/pdfdoc.c
index eba290014c9..19212824ab5 100644
--- a/Build/source/texk/dvipdfmx/src/pdfdoc.c
+++ b/Build/source/texk/dvipdfmx/src/pdfdoc.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfdoc.c,v 1.44 2006/12/20 08:10:13 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfdoc.c,v 1.47 2007/11/14 03:36:01 chofchof Exp $
  
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -511,7 +511,7 @@ asn_date (char *date_string)
 # ifdef HAVE_TM_GMTOFF
 #  define timezone (-bd_time->tm_gmtoff)
 # else
-#  define timezone  (-compute_timezone_offset())
+#  define timezone (-compute_timezone_offset())
 # endif /* not HAVE_TM_GMTOFF */
 #endif  /* not HAVE_TIMEZONE */
   time_t      current_time;
@@ -1037,6 +1037,7 @@ flush_bookmarks (pdf_olitem *node,
                pdf_new_name("Last"),
                pdf_link_obj(prev_ref));
 
+  pdf_release_obj(prev_ref);
   pdf_release_obj(node->dict);
   node->dict = NULL;
 
@@ -2023,12 +2024,13 @@ static char *doccreator = NULL; /* Ugh */
 
 void
 pdf_open_document (const char *filename,
+		   int do_encryption, int do_objstm,
                    double media_width, double media_height,
                    double annot_grow_amount, int bookmark_open_depth)
 {
   pdf_doc *p = &pdoc;
 
-  pdf_out_init(filename);
+  pdf_out_init(filename, do_encryption);
 
   pdf_doc_init_catalog(p);
 
@@ -2054,7 +2056,14 @@ pdf_open_document (const char *filename,
   pdf_doc_init_names    (p);
   pdf_doc_init_page_tree(p, media_width, media_height);
 
-  create_encrypt();
+  if (do_encryption) {
+    pdf_obj *encrypt = pdf_encrypt_obj();
+    pdf_set_encrypt(encrypt, pdf_enc_id_array());
+    pdf_release_obj(encrypt);
+  }
+
+  if (do_objstm)
+    pdf_objstm_init();
 
 #ifndef NO_THUMBNAIL
   /* Create a default name for thumbnail image files */
@@ -2118,6 +2127,8 @@ pdf_close_document (void)
   }
 #endif /* !NO_THUMBNAIL */
 
+  pdf_objstm_close();
+
   return;
 }
 
diff --git a/Build/source/texk/dvipdfmx/src/pdfdoc.h b/Build/source/texk/dvipdfmx/src/pdfdoc.h
index 0d160e18a7f..2fd805c6077 100644
--- a/Build/source/texk/dvipdfmx/src/pdfdoc.h
+++ b/Build/source/texk/dvipdfmx/src/pdfdoc.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfdoc.h,v 1.19 2005/07/30 11:44:18 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfdoc.h,v 1.21 2007/11/14 03:36:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -33,6 +33,7 @@
 extern void     pdf_doc_set_verbose (void);
 
 extern void     pdf_open_document  (const char *filename,
+				    int do_encryption, int do_objstm,
 				    double media_width, double media_height,
 				    double annot_grow_amount, int bookmark_open_depth);
 extern void     pdf_close_document (void);
diff --git a/Build/source/texk/dvipdfmx/src/pdfencoding.c b/Build/source/texk/dvipdfmx/src/pdfencoding.c
index bbf8e03a280..e95486473e0 100644
--- a/Build/source/texk/dvipdfmx/src/pdfencoding.c
+++ b/Build/source/texk/dvipdfmx/src/pdfencoding.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencoding.c,v 1.5 2005/07/21 08:23:46 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencoding.c,v 1.6 2007/11/14 03:12:21 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -39,12 +39,9 @@
 
 #include "pdfencoding.h"
 
-#define _ENCODINGS_C_
-#include "asl_charset.h"
-#undef  _ENCODINGS_C_
-
-static int      is_ASL_charset (char **encoding);
-static pdf_obj *make_encoding_differences (char **encoding, char **baseenc);
+static int      is_similar_charset (char **encoding, const char **encoding2);
+static pdf_obj *make_encoding_differences (char **encoding, char **baseenc,
+					   const char *is_used);
 
 static unsigned char verbose = 0;
 
@@ -68,12 +65,11 @@ pdf_encoding_set_verbose (void)
  *   IS_PREDEFINED:
  *     Encoding is one of the MacRomanEncoding, MacExpertEncoding, and
  *     WinAnsiEncoding.
- *   IS_ASL_CHARSET:
- *     Encoded glyphs are only form Adobe Standard Latin Character Set.
- *     Fonts only uses encodings of this flag set can be "nonsymbolic".
+ *   FLAG_USED_BY_TYPE3:
+ *     Encoding is used by a Type 3 font.
  */
 #define FLAG_IS_PREDEFINED  (1 << 0)
-#define FLAG_IS_ASL_CHARSET (1 << 1)
+#define FLAG_USED_BY_TYPE3  (1 << 1)
 
 typedef struct pdf_encoding
 {
@@ -81,18 +77,21 @@ typedef struct pdf_encoding
 
   char     *enc_name;
   int       flags;
-  char     *glyphs[256];
+  char     *glyphs[256];     /* ".notdef" must be represented as NULL */
   char      is_used[256];
 
+  struct pdf_encoding *baseenc;
   pdf_obj  *tounicode;
-  char      accessible[256]; /* Flag indicating if glyphs
-                              * are accessible in Unicode.
-                              */
 
   pdf_obj  *resource;
-  pdf_obj  *reference;
 } pdf_encoding;
 
+static int      pdf_encoding_new_encoding (const char *enc_name,
+					   const char *ident,
+					   const char **encoding_vec,
+					   char *baseenc_name,
+					   int flags);
+
 static void
 pdf_init_encoding_struct (pdf_encoding *encoding)
 {
@@ -105,45 +104,59 @@ pdf_init_encoding_struct (pdf_encoding *encoding)
   memset(encoding->glyphs,  0, 256*sizeof(char *));
   memset(encoding->is_used, 0, 256);
 
-  memset(encoding->accessible, 0, 256);
   encoding->tounicode = NULL;
 
+  encoding->baseenc   = NULL;
   encoding->resource  = NULL;
-  encoding->reference = NULL;
 
   encoding->flags     = 0;
 
   return;
 }
 
+/* Creates the PDF Encoding entry for the encoding.
+ * If baseenc is non-null, it is used as BaseEncoding entry.
+ */
+static pdf_obj *
+create_encoding_resource (pdf_encoding *encoding, pdf_encoding *baseenc)
+{
+  ASSERT(encoding);
+  ASSERT(!encoding->resource);
+
+  pdf_obj *differences;
+ 
+  differences = make_encoding_differences(encoding->glyphs,
+					  baseenc ? baseenc->glyphs : NULL,
+					  encoding->is_used);
+  
+  if (differences) {
+    pdf_obj *resource = pdf_new_dict();
+    if (baseenc)
+      pdf_add_dict(resource, pdf_new_name("BaseEncoding"),
+		   pdf_link_obj(baseenc->resource));
+    pdf_add_dict(resource, pdf_new_name("Differences"),  differences);
+    return resource; 
+  } else {
+    /* we must have a base encoding */
+    ASSERT(baseenc);
+    return pdf_link_obj(baseenc->resource);
+  }
+}
+
 static void
 pdf_flush_encoding (pdf_encoding *encoding)
 {
   ASSERT(encoding);
 
-  if (encoding->resource)
+  if (encoding->resource) {
     pdf_release_obj(encoding->resource);
-  if (encoding->reference)
-    pdf_release_obj(encoding->reference);
+    encoding->resource  = NULL;
+  }
   if (encoding->tounicode) {
-    pdf_obj *tounicode;
-
-    tounicode = pdf_create_ToUnicode_CMap(encoding->enc_name,
-                                          encoding->glyphs,
-                                          encoding->is_used);
-    if (tounicode) {
-      pdf_add_stream(encoding->tounicode,
-                     pdf_stream_dataptr(tounicode),
-                     pdf_stream_length(tounicode));
-      pdf_release_obj(tounicode);
-    }
     pdf_release_obj(encoding->tounicode);
     encoding->tounicode = NULL;
   }
 
-  encoding->resource  = NULL;
-  encoding->reference = NULL;
-
   return;
 }
 
@@ -154,8 +167,6 @@ pdf_clean_encoding_struct (pdf_encoding *encoding)
 
   ASSERT(encoding);
 
-  if (encoding->reference)
-    ERROR("Object not flushed.");
   if (encoding->resource)
     ERROR("Object not flushed.");
 
@@ -180,88 +191,6 @@ pdf_clean_encoding_struct (pdf_encoding *encoding)
   return;
 }
 
-/*
- * The original dvipdfm describes as:
- *
- *  Some software doesn't like BaseEncoding key (e.g., FastLane) 
- *  so this code is commented out for the moment.  It may reemerge in the
- *  future
- *
- * and the line for BaseEncoding is commented out.
- *
- * I'm not sure why this happens. But maybe BaseEncoding key causes problems
- * when the font is Symbol font or TrueType font.
- */
-
-static void
-pdf_encoding_set_encoding (pdf_encoding *encoding,
-                           char **encoding_vec, const char *baseenc_name)
-{
-  char   **baseenc_vec = NULL;
-  pdf_obj *differences;
-  int      code;
-
-  ASSERT(encoding);
-  ASSERT(encoding_vec);
-
-  if (encoding->reference) {
-    WARN("Object already have a label... flushing");
-    pdf_flush_encoding(encoding);
-  }
-
-  encoding->flags = 0;
-  if (!encoding->resource) {
-    encoding->resource = pdf_new_dict();
-    pdf_add_dict(encoding->resource,
-                 pdf_new_name("Type"), pdf_new_name("Encoding"));
-  }
-
-  for (code = 0; code < 256; code++) {
-    if (encoding->glyphs[code])
-      RELEASE(encoding->glyphs[code]);
-    if (!encoding_vec[code] ||
-        !strcmp(encoding_vec[code], ".notdef"))
-      encoding->glyphs[code] = NULL;
-    else {
-      encoding->glyphs[code] = NEW(strlen(encoding_vec[code])+1, char);
-      strcpy(encoding->glyphs[code], encoding_vec[code]);
-    }
-  }
-
-  if (baseenc_name) {
-    if (!strcmp(baseenc_name, "WinAnsiEncoding"))
-      baseenc_vec = (char **) WinAnsiEncoding;
-    else if (!strcmp(baseenc_name, "MacRomanEncoding"))
-      baseenc_vec = (char **) MacRomanEncoding;
-    else if (!strcmp(baseenc_name, "MacExpertEncoding"))
-      baseenc_vec = (char **) MacExpertEncoding;
-    else
-      ERROR("Unknown encoding \"%s\".", baseenc_name);
-  } else {
-    baseenc_vec = NULL;
-  }
-
-  if (is_ASL_charset(encoding->glyphs)) {
-    encoding->flags |= FLAG_IS_ASL_CHARSET;
-    /* Dvipdfmx default setting. */
-    if (!baseenc_name) {
-      baseenc_vec  = (char **) WinAnsiEncoding; 
-      baseenc_name = (char *) "WinAnsiEncoding";
-    }
-  }
-
-  if (baseenc_name) {
-    pdf_add_dict(encoding->resource,
-                 pdf_new_name("BaseEncoding"), pdf_new_name(baseenc_name));
-  }
-  differences = make_encoding_differences(encoding->glyphs, baseenc_vec);
-  if (differences) {
-    pdf_add_dict(encoding->resource, pdf_new_name("Differences"),  differences);
-  }
-
-  return;
-}
-
 static int CDECL
 glycmp (const void *pv1, const void *pv2)
 {
@@ -274,23 +203,25 @@ glycmp (const void *pv1, const void *pv2)
 }
 
 static int
-is_ASL_charset (char **enc_vec)
+is_similar_charset (char **enc_vec, const char **enc_vec2)
 {
-  int   code;
+  int   code, same = 0;
 
-  for (code = 0; code < 256; code++) {
-    if (enc_vec[code] && strcmp(enc_vec[code], ".notdef")) {
-      if (!bsearch(enc_vec[code],
-                   ASL_Charset, ASL_CHARSET_MAX, sizeof(char *), glycmp))
-        return 0;
-    }
-  }
+  for (code = 0; code < 256; code++)
+    if (!(enc_vec[code] && strcmp(enc_vec[code], enc_vec2[code]))
+	&& ++same >= 64)
+      /* is 64 a good level? */
+      return 1;
 
-  return 1;
+  return 0; 
 }
 
+/* Creates a PDF Differences array for the encoding, based on the
+ * base encoding baseenc (if not NULL). Only character codes which
+ * are actually used in the document are considered.
+ */
 static pdf_obj *
-make_encoding_differences (char **enc_vec, char **baseenc)
+make_encoding_differences (char **enc_vec, char **baseenc, const char *is_used)
 {
   pdf_obj *differences = NULL;
   int      code, count = 0;
@@ -300,13 +231,14 @@ make_encoding_differences (char **enc_vec, char **baseenc)
 
   /*
    *  Write all entries (except .notdef) if baseenc is unknown.
+   *  If is_used is given, write only used entries.
    */
   differences = pdf_new_array();
   for (code = 0; code < 256; code++) {
-    /* We skip ".notdef". Any character code mapped to ".notdef"
+    /* We skip NULL (= ".notdef"). Any character code mapped to ".notdef"
      * glyph should not be used in the document.
      */
-    if (!enc_vec[code] || !strcmp(".notdef", enc_vec[code]))
+    if ((is_used && !is_used[code]) || !enc_vec[code])
       skipping = 1;
     else if (!baseenc || !baseenc[code] ||
              strcmp(baseenc[code], enc_vec[code]) != 0) {
@@ -335,17 +267,22 @@ make_encoding_differences (char **enc_vec, char **baseenc)
 }
 
 static int
-load_encoding_file (pdf_encoding *encoding, const char *filename)
+load_encoding_file (const char *filename)
 {
   FILE    *fp;
+  pdf_obj *enc_name = NULL;
   pdf_obj *encoding_array = NULL;
   char    *wbuf, *p, *endptr;
   char    *enc_vec[256];
-  int      code, fsize;
+  int      code, fsize, enc_id;
 
-  if (!encoding || !filename)
+  if (!filename)
     return -1;
 
+  if (verbose) {
+    MESG("(Encoding:%s", filename);
+  }
+
   fp = DPXFOPEN(filename, DPX_RES_TYPE_ENC);
   if (!fp)
     return -1;
@@ -372,30 +309,34 @@ load_encoding_file (pdf_encoding *encoding, const char *filename)
     skip_line (&p, endptr);
     skip_white(&p, endptr);
   }
-  if (p[0] == '/') {
-    pdf_obj *tmp;
-
-    tmp = parse_pdf_name(&p, endptr);
-
-    encoding->enc_name = NEW(strlen(pdf_name_value(tmp))+1, char);
-    strcpy(encoding->enc_name, pdf_name_value(tmp));
-    pdf_release_obj(tmp);
-  }
+  if (p[0] == '/')
+    enc_name = parse_pdf_name(&p, endptr);
 
   skip_white(&p, endptr);
   encoding_array = parse_pdf_array(&p, endptr);
   RELEASE(wbuf);
   if (!encoding_array) {
+    if (enc_name)
+      pdf_release_obj(enc_name);
     return -1;
   }
 
   for (code = 0; code < 256; code++) {
     enc_vec[code] = pdf_name_value(pdf_get_array(encoding_array, code));
   }
-  pdf_encoding_set_encoding(encoding, enc_vec, NULL);
+  enc_id = pdf_encoding_new_encoding(enc_name ? pdf_name_value(enc_name) : NULL,
+				     filename, (const char **) enc_vec, NULL, 0);
+
+  if (enc_name) {
+    if (verbose > 1)
+      MESG("[%s]", pdf_name_value(enc_name));
+    pdf_release_obj(enc_name);
+  }
   pdf_release_obj(encoding_array);
 
-  return 0;
+  if (verbose) MESG(")");
+
+  return enc_id;
 }
 
 #define CHECK_ID(n) do { \
@@ -427,63 +368,111 @@ pdf_init_encodings (void)
   /*
    * PDF Predefined Encodings
    */
-  encoding = &enc_cache.encodings[0];
-  pdf_init_encoding_struct(encoding);
-  encoding->ident = NEW(strlen("WinAnsiEncoding")+1, char);
-  strcpy(encoding->ident, "WinAnsiEncoding");
-  encoding->enc_name  = NEW(strlen("WinAnsiEncoding")+1, char);
-  strcpy(encoding->enc_name, "WinAnsiEncoding");
-  encoding->flags    = (FLAG_IS_PREDEFINED|FLAG_IS_ASL_CHARSET);
-  encoding->resource = pdf_new_name("WinAnsiEncoding");
-  for (code = 0; code < 256; code++) {
-    if (!WinAnsiEncoding[code] ||
-        !strcmp(WinAnsiEncoding[code], ".notdef"))
-      encoding->glyphs[code] = NULL;
-    else {
-      encoding->glyphs[code] = NEW(strlen(WinAnsiEncoding[code])+1, char);
-      strcpy(encoding->glyphs[code], WinAnsiEncoding[code]);
-    }
+  pdf_encoding_new_encoding("WinAnsiEncoding", "WinAnsiEncoding",
+			    WinAnsiEncoding, NULL, FLAG_IS_PREDEFINED);
+  pdf_encoding_new_encoding("MacRomanEncoding", "MacRomanEncoding",
+			    MacRomanEncoding, NULL, FLAG_IS_PREDEFINED);
+  pdf_encoding_new_encoding("MacExpertEncoding", "MacExpertEncoding",
+			    MacExpertEncoding, NULL, FLAG_IS_PREDEFINED);
+
+  return;
+}
+
+/*
+ * The original dvipdfm describes as:
+ *
+ *  Some software doesn't like BaseEncoding key (e.g., FastLane) 
+ *  so this code is commented out for the moment.  It may reemerge in the
+ *  future
+ *
+ * and the line for BaseEncoding is commented out.
+ *
+ * I'm not sure why this happens. But maybe BaseEncoding key causes problems
+ * when the font is Symbol font or TrueType font.
+ */
+
+static int
+pdf_encoding_new_encoding (const char *enc_name, const char *ident,
+			   const char **encoding_vec,
+			   char *baseenc_name, int flags)
+{
+  char   **baseenc_vec = NULL;
+  pdf_obj *differences;
+  int      enc_id, code;
+
+  pdf_encoding *encoding;
+
+  enc_id   = enc_cache.count;
+  if (enc_cache.count++ >= enc_cache.capacity) {
+    enc_cache.capacity += 16;
+    enc_cache.encodings = RENEW(enc_cache.encodings,
+                                enc_cache.capacity,  pdf_encoding);
   }
+  encoding = &enc_cache.encodings[enc_id];
 
-  encoding = &enc_cache.encodings[1];
   pdf_init_encoding_struct(encoding);
-  encoding->ident = NEW(strlen("MacRomanEncoding")+1, char);
-  strcpy(encoding->ident, "MacRomanEncoding");
-  encoding->enc_name  = NEW(strlen("MacRomanEncoding")+1, char);
-  strcpy(encoding->enc_name, "MacRomanEncoding");
-  encoding->flags    = (FLAG_IS_PREDEFINED|FLAG_IS_ASL_CHARSET);
-  encoding->resource = pdf_new_name("MacRomanEncoding");
-  for (code = 0; code < 256; code++) {
-    if (!MacRomanEncoding[code] ||
-        !strcmp(MacRomanEncoding[code], ".notdef"))
-      encoding->glyphs[code] = NULL;
-    else {
-      encoding->glyphs[code] = NEW(strlen(MacRomanEncoding[code])+1, char);
-      strcpy(encoding->glyphs[code], MacRomanEncoding[code]);
+
+  encoding->ident = NEW(strlen(ident)+1, char);
+  strcpy(encoding->ident, ident);
+  encoding->enc_name  = NEW(strlen(enc_name)+1, char);
+  strcpy(encoding->enc_name, enc_name);
+
+  encoding->flags = flags;
+
+  for (code = 0; code < 256; code++)
+    if (encoding_vec[code] && strcmp(encoding_vec[code], ".notdef")) {
+      encoding->glyphs[code] = NEW(strlen(encoding_vec[code])+1, char);
+      strcpy(encoding->glyphs[code], encoding_vec[code]);
     }
+
+  if (!baseenc_name && !(flags & FLAG_IS_PREDEFINED)
+      && is_similar_charset(encoding->glyphs, WinAnsiEncoding)) {
+    /* Dvipdfmx default setting. */
+    baseenc_name = "WinAnsiEncoding";
   }
 
-  encoding = &enc_cache.encodings[2];
-  pdf_init_encoding_struct(encoding);
-  encoding->ident = NEW(strlen("MacExpertEncoding")+1, char);
-  strcpy(encoding->ident, "MacExpertEncoding");
-  encoding->enc_name  = NEW(strlen("MacExpertEncoding")+1, char);
-  strcpy(encoding->enc_name, "MacExpertEncoding");
-  encoding->flags    = FLAG_IS_PREDEFINED;
-  encoding->resource = pdf_new_name("MacExpertEncoding");
-  for (code = 0; code < 256; code++) {
-    if (!MacExpertEncoding[code] ||
-        !strcmp(MacExpertEncoding[code], ".notdef"))
-      encoding->glyphs[code] = NULL;
-    else {
-      encoding->glyphs[code] = NEW(strlen(MacExpertEncoding[code])+1, char);
-      strcpy(encoding->glyphs[code], MacExpertEncoding[code]);
-    }
+  /* TODO: make base encoding configurable */
+  if (baseenc_name) {
+    int baseenc_id = pdf_encoding_findresource(baseenc_name);
+    if (baseenc_id < 0 || !pdf_encoding_is_predefined(baseenc_id))
+      ERROR("Illegal base encoding %s for encoding %s\n",
+	    baseenc_name, encoding->enc_name);
+    encoding->baseenc = &enc_cache.encodings[baseenc_id];
   }
 
-  enc_cache.count = 3;
+  if (flags & FLAG_IS_PREDEFINED)
+    encoding->resource = pdf_new_name(encoding->enc_name);
 
-  return;
+  return enc_id;
+}
+
+/* Creates Encoding resource and ToUnicode CMap 
+ * for all non-predefined encodings.
+ */
+void pdf_encoding_complete ()
+{
+  int  enc_id;
+
+  for (enc_id = 0; enc_id < enc_cache.count; enc_id++) {
+    if (!pdf_encoding_is_predefined(enc_id)) {
+      pdf_encoding *encoding = &enc_cache.encodings[enc_id];
+      /* Section 5.5.4 of the PDF 1.5 reference says that the encoding
+       * of a Type 3 font must be completely described by a Differences
+       * array, but implementation note 56 explains that this is rather
+       * an incorrect implementation in Acrobat 4 and earlier. Hence,
+       * we do use a base encodings for PDF versions >= 1.3.
+       */
+      int with_base = !(encoding->flags & FLAG_USED_BY_TYPE3)
+	              || pdf_get_version() >= 4;
+      ASSERT(!encoding->resource);
+      encoding->resource = create_encoding_resource(encoding,
+						    with_base ? encoding->baseenc : NULL);
+      ASSERT(!encoding->tounicode);
+      encoding->tounicode = pdf_create_ToUnicode_CMap(encoding->enc_name,
+						      encoding->glyphs,
+						      encoding->is_used);
+    }
+  }
 }
 
 void
@@ -509,7 +498,7 @@ pdf_close_encodings (void)
 }
 
 int
-pdf_encoding_findresource (const char *enc_name)
+pdf_encoding_findresource (char *enc_name)
 {
   int           enc_id;
   pdf_encoding *encoding;
@@ -525,37 +514,7 @@ pdf_encoding_findresource (const char *enc_name)
       return enc_id;
   }
 
-  if (verbose) {
-    MESG("(Encoding:%s", enc_name);
-  }
-
-  enc_id   = enc_cache.count;
-  if (enc_cache.count >= enc_cache.capacity) {
-    enc_cache.capacity += 16;
-    enc_cache.encodings = RENEW(enc_cache.encodings,
-                                enc_cache.capacity,  pdf_encoding);
-  }
-  encoding = &enc_cache.encodings[enc_id];
-
-  pdf_init_encoding_struct(encoding);
-  encoding->ident = NEW(strlen(enc_name)+1, char);
-  strcpy(encoding->ident, enc_name);
-  if (load_encoding_file(encoding, enc_name) < 0) {
-    pdf_clean_encoding_struct(encoding);
-    return -1;
-  }
-
-  if (verbose > 1) {
-    if (encoding->enc_name) {
-      MESG("[%s]", encoding->enc_name);
-    }
-  }
-
-  if (verbose) MESG(")");
-
-  enc_cache.count++;
-
-  return enc_id;
+  return load_encoding_file(enc_name);
 }
 
 
@@ -576,7 +535,7 @@ pdf_encoding_get_encoding (int enc_id)
 }
 
 pdf_obj *
-pdf_get_encoding_reference (int enc_id)
+pdf_get_encoding_obj (int enc_id)
 {
   pdf_encoding *encoding;
 
@@ -584,10 +543,7 @@ pdf_get_encoding_reference (int enc_id)
 
   encoding = &enc_cache.encodings[enc_id];
 
-  if (!encoding->reference)
-    encoding->reference = pdf_ref_obj(encoding->resource);
-
-  return pdf_link_obj(encoding->reference);
+  return encoding->resource;
 }
 
 int
@@ -602,8 +558,8 @@ pdf_encoding_is_predefined (int enc_id)
   return (encoding->flags & FLAG_IS_PREDEFINED) ? 1 : 0;
 }
 
-int
-pdf_encoding_is_ASL_charset (int enc_id)
+void
+pdf_encoding_used_by_type3 (int enc_id)
 {
   pdf_encoding *encoding;
 
@@ -611,9 +567,10 @@ pdf_encoding_is_ASL_charset (int enc_id)
 
   encoding = &enc_cache.encodings[enc_id];
 
-  return (encoding->flags & FLAG_IS_ASL_CHARSET) ? 1 : 0;
+  encoding->flags |= FLAG_USED_BY_TYPE3;
 }
 
+
 char *
 pdf_encoding_get_name (int enc_id)
 {
@@ -640,110 +597,49 @@ static unsigned char wbuf[WBUF_SIZE];
 static unsigned char range_min[1] = {0x00u};
 static unsigned char range_max[1] = {0xFFu};
 
-#define UNICODE_ACCESSIBLE     1
-#define UNICODE_INACCESSIBLE  -1
-#define UNICODE_UNKNOWN        0
-
-static int
-check_unicode_mappable (pdf_encoding *encoding,	char *is_used)
-{
-  int   code;
-  int   glyph_count, total_fail_count;
-
-  glyph_count = total_fail_count = 0;
-  for (code = 0; code <= 0xff; code++) {
-    if (is_used && !is_used[code])
-      continue;
-
-    switch (encoding->accessible[code]) {
-    case UNICODE_ACCESSIBLE:
-      break;
-    case UNICODE_INACCESSIBLE:
-      total_fail_count++;
-      break;
-    default: /* Unknown */
-      if (!encoding->glyphs[code] ||
-          !strcmp(encoding->glyphs[code], ".notdef"))
-         encoding->accessible[code] = UNICODE_INACCESSIBLE;
-      else {
-        long  len;
-        int   fail_count = 0;
-        unsigned char *p, *endptr;
-
-        p      = wbuf;
-        endptr = wbuf + WBUF_SIZE;
-        len = agl_sput_UTF16BE(encoding->glyphs[code],
-                               &p, endptr, &fail_count);
-        if (len < 1 || fail_count > 0) {
-          total_fail_count++;
-          encoding->accessible[code] = UNICODE_INACCESSIBLE;
-        } else {
-          encoding->accessible[code] = UNICODE_ACCESSIBLE;
-        }
-      }
-    }
-    glyph_count++;
-  }
-
-  if (glyph_count < 1)
-    return 0;
-
-  return (int) (100.0 * total_fail_count / glyph_count + 0.5);
-}
-
-int
-pdf_attach_ToUnicode_CMap (pdf_obj *fontdict,
-                           int encoding_id, char *is_used)
+void
+pdf_encoding_add_usedchars (int encoding_id, const char *is_used)
 {
   pdf_encoding *encoding;
-  int           inaccessibles, code;
-
-  ASSERT(fontdict);
+  int code;
 
   CHECK_ID(encoding_id);
 
-  if (pdf_encoding_is_predefined(encoding_id)) {
-    return 0;
-  }
+  if (!is_used || pdf_encoding_is_predefined(encoding_id))
+    return;
 
   encoding = &enc_cache.encodings[encoding_id];
-  
-  inaccessibles = check_unicode_mappable(encoding, is_used);
-  if (inaccessibles > 10) { /* 10 % */
-    if (verbose) {
-      WARN("%d%% of glyph in font (encoding: %s) could not converted to Unicode.",
-           inaccessibles, encoding->enc_name);
-      WARN("ToUnicode CMap not attached for this font.");
-    }
-    return -1;
-  }
-
-  for (code = 0; code <= 0xff; code++) {
-    if (is_used && !is_used[code])
-      continue;
-    encoding->is_used[code] = 1;
-  }
 
-  if (!encoding->tounicode) {
-    encoding->tounicode = pdf_new_stream(STREAM_COMPRESS);
-  }
+  for (code = 0; code <= 0xff; code++)
+    encoding->is_used[code] |= is_used[code];
+}
 
-  pdf_add_dict(fontdict,
-               pdf_new_name("ToUnicode"),
-               pdf_ref_obj(encoding->tounicode));
+pdf_obj *
+pdf_encoding_get_tounicode (int encoding_id)
+{
+  CHECK_ID(encoding_id);
 
-  return 0;
+  return enc_cache.encodings[encoding_id].tounicode;
 }
 
 
-
+/* Creates a ToUnicode CMap. An empty CMap is replaced by NULL.
+ *
+ * For PDF <= 1.4 a complete CMap is created unless all character codes
+ * are predefined in PDF. For PDF >= 1.5 only those character codes which
+ * are not predefined appear in the CMap.
+ *
+ * Note: The PDF 1.4 reference is not consistent: Section 5.9 describes
+ * the Unicode mapping of PDF 1.3 and Section 9.7.2 (in the context of
+ * Tagged PDF) the one of PDF 1.5.
+ */
 pdf_obj *
 pdf_create_ToUnicode_CMap (const char *enc_name,
-                           char **enc_vec, char *is_used)
+                           char **enc_vec, const char *is_used)
 {
   pdf_obj  *stream;
   CMap     *cmap;
-  int       code, glyph_count, total_fail_count;
+  int       code, all_predef;
   char     *cmap_name;
   unsigned char *p, *endptr;
 
@@ -761,38 +657,33 @@ pdf_create_ToUnicode_CMap (const char *enc_name,
 
   CMap_add_codespacerange(cmap, range_min, range_max, 1);
 
-  glyph_count = total_fail_count = 0;
+  all_predef = 1;
   for (code = 0; code <= 0xff; code++) {
     if (is_used && !is_used[code])
       continue;
 
-    if (enc_vec[code] && strcmp(enc_vec[code], ".notdef")) {
+    if (enc_vec[code]) {
       long   len;
       int    fail_count = 0;
-
-      wbuf[0] = (code & 0xff);
-      p      = wbuf + 1;
-      endptr = wbuf + WBUF_SIZE;
-      len = agl_sput_UTF16BE(enc_vec[code], &p, endptr, &fail_count);
-      if (len < 1 || fail_count > 0) {
-        total_fail_count++;
-      } else {
-        CMap_add_bfchar(cmap, wbuf, 1, wbuf + 1, len);
+      agl_name *agln = agl_lookup_list(enc_vec[code]);
+      /* Adobe glyph naming conventions are not used by viewers,
+       * hence even ligatures (e.g, "f_i") must be explicitly defined
+       */
+      if (pdf_get_version() < 5 || !agln || !agln->is_predef) {
+        wbuf[0] = (code & 0xff);
+        p      = wbuf + 1;
+        endptr = wbuf + WBUF_SIZE;
+        len = agl_sput_UTF16BE(enc_vec[code], &p, endptr, &fail_count);
+        if (len >= 1 && !fail_count) {
+          CMap_add_bfchar(cmap, wbuf, 1, wbuf + 1, len);
+	  all_predef &= agln && agln->is_predef;
+        }
       }
-      glyph_count++;
     }
   }
 
-  if (total_fail_count < (glyph_count + 9) / 10) {
-    stream = CMap_create_stream(cmap, 0);
-  } else {
-    if (verbose) {
-      WARN("%d (out of %d) glyphs in encoding \"%s\" missing Unicode mapping...",
-           total_fail_count, glyph_count, enc_name);
-      WARN("ToUnicode CMap \"%s\" removed.", cmap_name);
-    }
-    stream = NULL;
-  }
+  stream = all_predef ? NULL : CMap_create_stream(cmap, 0);
+
   CMap_release(cmap);
   RELEASE(cmap_name);
 
diff --git a/Build/source/texk/dvipdfmx/src/pdfencoding.h b/Build/source/texk/dvipdfmx/src/pdfencoding.h
index 05ac38d2e22..fdfbe7b6923 100644
--- a/Build/source/texk/dvipdfmx/src/pdfencoding.h
+++ b/Build/source/texk/dvipdfmx/src/pdfencoding.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencoding.h,v 1.3 2005/06/08 11:18:37 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencoding.h,v 1.4 2007/11/14 03:12:21 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -32,17 +32,22 @@ extern void      pdf_encoding_set_verbose    (void);
 extern void      pdf_init_encodings          (void);
 extern void      pdf_close_encodings         (void);
 
+/* Creates Encoding resource and ToUnicode CMap 
+ * for all non-predefined encodings.
+ */
+extern void      pdf_encoding_complete       (void);
+
 /* enc_name here is .enc file name or the name of predefined
  * encodings.
  */
-extern int       pdf_encoding_findresource   (const char *enc_name);
+extern int       pdf_encoding_findresource   (char *enc_name);
 
-/* Returns indirect reference to Encoding resource.
+/* Returns the Encoding resource object.
  */
-extern pdf_obj  *pdf_get_encoding_reference  (int enc_id);
+extern pdf_obj  *pdf_get_encoding_obj        (int enc_id);
 
-extern int       pdf_encoding_is_ASL_charset (int enc_id);
 extern int       pdf_encoding_is_predefined  (int enc_id);
+extern void      pdf_encoding_used_by_type3  (int enc_id);
 
 /* WARNING:
  * Pointer(s) may change after another encoding is loaded.
@@ -51,29 +56,21 @@ extern char     *pdf_encoding_get_name       (int enc_id);
 extern char    **pdf_encoding_get_encoding   (int enc_id);
 
 /* 
- * The last argument "is_used" is 256 char array, value 0
- * indicates glyph in that slot is not used in the document
- * (at least for that font). We need this to handle the
- * situation that the encoding contains, e.g., 30 rarely
- * used glyphs without Unicode mapping and 200+ glyphs with
- * Unicode mapping.
  * pdf_create_ToUnicode_CMap() returns stream object but not
  * reference. This need to be renamed to other name like
  * pdf_create_ToUnicode_stream().
  */
 extern pdf_obj  *pdf_create_ToUnicode_CMap   (const char *enc_name,
-					      char **enc_vec, char *is_used);
-
-/* Add /ToUnicode entry with indirect reference to ToUnicode stream
- * to font dictionary "fontdict". This creates an empty stream object
- * if it has not already created. Generation of actual ToUnicode CMap
- * data is delayed until pdf_close_encodings(). This also check if
- * glyphs can be converted to (a sequence of) Unicode and returns -1
- * if more than 10% of glyphs can't be converted. ToUnicode CMap is
- * not attached in that case.
+					      char **enc_vec,
+					      const char *is_used);
+
+/* pdf_encoding_copy_usedchars adds the given vector of used characters
+ * to the corresponding vector of the encoding.
  */
-extern int       pdf_attach_ToUnicode_CMap   (pdf_obj *fontdict,
-					      int encoding_id, char *is_used);
+extern void      pdf_encoding_add_usedchars (int encoding_id,
+					      const char *is_used);
+
+extern pdf_obj * pdf_encoding_get_tounicode  (int encoding_id);
 
 /* Just load CMap identified with 'ident'. (parsed)
  * PDF stream object (not reference) returned.
diff --git a/Build/source/texk/dvipdfmx/src/pdfencrypt.c b/Build/source/texk/dvipdfmx/src/pdfencrypt.c
index dc9b8efde20..677febc3d5c 100644
--- a/Build/source/texk/dvipdfmx/src/pdfencrypt.c
+++ b/Build/source/texk/dvipdfmx/src/pdfencrypt.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencrypt.c,v 1.8 2005/07/20 08:49:55 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencrypt.c,v 1.9 2007/04/03 05:25:50 chofchof Exp $
  
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -71,7 +71,6 @@ static const unsigned char padding_string[MAX_STR_LEN] = {
 
 static char owner_passwd[MAX_PWD_LEN], user_passwd[MAX_PWD_LEN];
 
-static unsigned char do_encryption = 0;
 static unsigned char verbose = 0;
 
 void pdf_enc_set_verbose (void)
@@ -379,7 +378,6 @@ void pdf_enc_set_passwd (unsigned bits, unsigned perm, char *dviname, char *pdfn
     fflush(stderr);
   }
 
-  do_encryption = 1;
   key_size = (unsigned char)(bits / 8);
   algorithm = (key_size == 5 ? 1 : 2);
   permission = (unsigned long)perm | 0x000000C0;
@@ -396,8 +394,6 @@ void pdf_encrypt_data (unsigned char *data, unsigned long len)
 {
   unsigned char *result;
 
-  if (!do_encryption) return;
-
   memcpy(in_buf, key_data, key_size);
   in_buf[key_size]   = (unsigned char)(current_label) & 0xFF;
   in_buf[key_size+1] = (unsigned char)(current_label >> 8) & 0xFF;
@@ -416,20 +412,15 @@ void pdf_encrypt_data (unsigned char *data, unsigned long len)
   RELEASE (result);
 }
 
-void create_encrypt (void)
+pdf_obj *pdf_encrypt_obj (void)
 {
   pdf_obj *doc_encrypt;
 
-  if (!do_encryption) return;
-
 #ifdef DEBUG
-  fprintf (stderr, "(create_encrypt)");
+  fprintf (stderr, "(pdf_encrypt_obj)");
 #endif
 
-  /* Create an empty Encryption entry and make it
-     be the root object */
   doc_encrypt = pdf_new_dict ();
-  pdf_set_encrypt (doc_encrypt);
 
   /* KEY  : Filter
    * TYPE : name
@@ -509,20 +500,15 @@ void create_encrypt (void)
 		pdf_new_name ("P"),
 		pdf_new_number (permission));
 
-  do_encryption = 0;
-  pdf_release_obj (doc_encrypt);
-  do_encryption = 1;
+  return doc_encrypt;
 }
 
-unsigned char *pdf_enc_id_string (void)
+pdf_obj *pdf_enc_id_array (void)
 {
-  register int i;
-  static unsigned char result[MAX_STR_LEN+1];
-
-  for (i = 0; i < MAX_KEY_LEN; i++)
-    sprintf((char *)(result+2*i), "%02x", id_string[i]);
-
-  return result;
+  pdf_obj *id = pdf_new_array();
+  pdf_add_array(id, pdf_new_string(id_string, MAX_KEY_LEN));
+  pdf_add_array(id, pdf_new_string(id_string, MAX_KEY_LEN));
+  return id;
 }
 
 void pdf_enc_set_label (unsigned long label)
diff --git a/Build/source/texk/dvipdfmx/src/pdfencrypt.h b/Build/source/texk/dvipdfmx/src/pdfencrypt.h
index daaa6f52bcc..b0c9a429223 100644
--- a/Build/source/texk/dvipdfmx/src/pdfencrypt.h
+++ b/Build/source/texk/dvipdfmx/src/pdfencrypt.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencrypt.h,v 1.2 2002/10/30 02:27:13 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfencrypt.h,v 1.3 2007/04/03 05:25:50 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -23,13 +23,14 @@
 #ifndef _PDFENCRYPT_H_
 #define _PDFENCRYPT_H_
 
+#include "pdfobj.h"
+
 extern void pdf_enc_set_verbose (void);
-extern unsigned char *pdf_enc_id_string (void);
-extern void pdf_enc_set_encryption (void);
+extern pdf_obj *pdf_enc_id_array (void);
 extern void pdf_enc_set_label (unsigned long label);
 extern void pdf_enc_set_generation (unsigned generation);
 extern void pdf_enc_set_passwd (unsigned size, unsigned perm, char *dviname, char *pdfname);
 extern void pdf_encrypt_data (unsigned char *data, unsigned long len);
-extern void create_encrypt (void);
+extern pdf_obj *pdf_encrypt_obj (void);
 
 #endif /* _PDFENCRYPT_H_ */
diff --git a/Build/source/texk/dvipdfmx/src/pdffont.c b/Build/source/texk/dvipdfmx/src/pdffont.c
index 086b9c990ae..d011e59da9a 100644
--- a/Build/source/texk/dvipdfmx/src/pdffont.c
+++ b/Build/source/texk/dvipdfmx/src/pdffont.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdffont.c,v 1.15 2005/07/20 10:41:54 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdffont.c,v 1.17 2007/11/15 17:08:52 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -484,12 +484,15 @@ pdf_close_fonts (void)
     case PDF_FONT_FONTTYPE_TYPE1:
       if (__verbose)
 	MESG("[Type1]");
-      retval = pdf_font_load_type1  (font);
+      if (!pdf_font_get_flag(font, PDF_FONT_FLAG_BASEFONT))
+	retval = pdf_font_load_type1(font);
+      else
+	retval = 0;
       break;
     case PDF_FONT_FONTTYPE_TYPE1C:
       if (__verbose)
 	MESG("[Type1C]");
-      retval = pdf_font_load_type1c (font);
+      retval = pdf_font_load_type1c(font);
       break;
     case PDF_FONT_FONTTYPE_TRUETYPE:
       if (__verbose)
@@ -508,10 +511,41 @@ pdf_close_fonts (void)
       break;
     }
 
+    if (font->encoding_id >= 0 && font->subtype != PDF_FONT_FONTTYPE_TYPE0)
+      pdf_encoding_add_usedchars(font->encoding_id, font->usedchars);
+
     if (__verbose) {
       if (font->subtype != PDF_FONT_FONTTYPE_TYPE0)
 	MESG(")");
     }
+  }
+
+  pdf_encoding_complete();
+
+  for (font_id = 0; font_id < font_cache.count; font_id++) {
+    pdf_font *font = GET_FONT(font_id);
+
+    if (font->encoding_id >= 0 && font->subtype != PDF_FONT_FONTTYPE_TYPE0) {
+      pdf_obj *enc_obj = pdf_get_encoding_obj(font->encoding_id);
+      pdf_obj *tounicode;
+
+      /* Predefined encodings (and those simplified to them) are embedded
+	 as direct objects, but this is purely a matter of taste. */
+      pdf_add_dict(font->resource,
+		   pdf_new_name("Encoding"),
+		   PDF_OBJ_NAMETYPE(enc_obj) ? pdf_link_obj(enc_obj) : pdf_ref_obj(enc_obj));
+
+      if (!pdf_lookup_dict(font->resource, "ToUnicode")
+	  && (tounicode = pdf_encoding_get_tounicode(font->encoding_id)))
+	pdf_add_dict(font->resource,
+		     pdf_new_name("ToUnicode"), pdf_ref_obj(tounicode));
+    } else if (font->subtype == PDF_FONT_FONTTYPE_TRUETYPE) {
+      /* encoding_id < 0 means MacRoman here (but not really)
+       * We use MacRoman as "default" encoding. */
+      pdf_add_dict(font->resource,
+                   pdf_new_name("Encoding"),
+		   pdf_new_name("MacRomanEncoding"));
+    }
 
     pdf_flush_font(font);
     pdf_clean_font_struct(font);
@@ -661,6 +695,9 @@ pdf_font_findresource (const char *tex_name,
       case PDF_FONT_FONTTYPE_TRUETYPE:
 	/* fontname here is font file name.
 	 * We must compare both font file name and encoding
+	 *
+	 * TODO: Embed a font only once if it is used
+	 *       with two different encodings
 	 */
 	if (!strcmp(fontname, font->ident)   &&
 	    encoding_id == font->encoding_id) {
@@ -670,7 +707,9 @@ pdf_font_findresource (const char *tex_name,
       case PDF_FONT_FONTTYPE_TYPE3:
 	/* There shouldn't be any encoding specified for PK font.
 	 * It must be always font's build-in encoding.
-	 */
+	 *
+	 * TODO: a PK font with two encodings makes no sense. Change?
+         */
 	if (!strcmp(fontname, font->ident) &&
 	    font_scale == font->point_size) {
 	  found = 1;
diff --git a/Build/source/texk/dvipdfmx/src/pdfobj.c b/Build/source/texk/dvipdfmx/src/pdfobj.c
index 39445ba875a..645295ebb12 100644
--- a/Build/source/texk/dvipdfmx/src/pdfobj.c
+++ b/Build/source/texk/dvipdfmx/src/pdfobj.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfobj.c,v 1.40 2006/12/06 13:14:54 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfobj.c,v 1.47 2007/11/14 03:36:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -42,11 +42,19 @@
 #endif /* HAVE_ZLIB */
 
 #include "pdfobj.h"
+#include "pdfdev.h"
 
 #define STREAM_ALLOC_SIZE      4096u
 #define ARRAY_ALLOC_SIZE       256
 #define IND_OBJECTS_ALLOC_SIZE 512
 
+#define OBJ_NO_OBJSTM   (1 << 0)
+/* Objects with this flag will not be put into an object stream.
+   For instance, all stream objects have this flag set.          */
+#define OBJ_NO_ENCRYPT  (1 << 1)
+/* Objects with this flag will not be encrypted.
+   This implies OBJ_NO_OBJSTM if encryption is turned on.        */
+
 /* Any of these types can be represented as follows */
 struct pdf_obj 
 {
@@ -56,6 +64,7 @@ struct pdf_obj
 			    all other "label" to zero */
   unsigned short generation;  /* Only used if "label" is used */
   unsigned refcount;  /* Number of links to this object */
+  int      flags;
   void    *data;
 };
 
@@ -105,8 +114,8 @@ struct pdf_stream
 
 struct pdf_indirect
 {
-  unsigned label;
-  unsigned generation;
+  unsigned long label;
+  unsigned short generation;
   int dirty;  /* Dirty objects came from an input file and were not
 		 generated by this program.  They have a label in a
 		 different numbering sequence.  These are translated
@@ -136,19 +145,35 @@ static char format_buffer[FORMAT_BUF_SIZE];
 
 static struct xref_entry 
 {
-  long     file_position;
-  pdf_obj *object;
-  int      used; /* Used by PDF import */
-} *output_xref = NULL;
+  unsigned char  type;
+  unsigned long  field2;
+  unsigned short field3;  
+  int            used; /* Used by PDF import */
+} *output_xref;
 
-static unsigned long pdf_max_ind_objects = 0;
-static unsigned long next_label          = 1;
+static unsigned long pdf_max_ind_objects;
+static unsigned long next_label;
 
 static unsigned long startxref;
 
-static unsigned pdf_root_obj    = 0;
-static unsigned pdf_info_obj    = 0;
-static unsigned pdf_encrypt_obj = 0;
+static pdf_obj *output_stream;
+
+#define OBJSTM_MAX_OBJS  200
+/* the limit is only 100 for linearized PDF */
+
+typedef struct pdf_objstm
+{
+  pdf_obj *stream;
+  unsigned long obj_label[OBJSTM_MAX_OBJS];
+  unsigned long obj_pos  [OBJSTM_MAX_OBJS];
+  unsigned char pos;
+} pdf_objstm;
+
+static int enc_mode;
+static int doc_enc_mode;
+
+static pdf_obj *trailer_dict;
+static pdf_obj *xref_stream;
 
 /* Internal static routines */
 
@@ -156,6 +181,8 @@ static void pdf_flush_obj (pdf_obj *object, FILE *file);
 static void pdf_label_obj (pdf_obj *object);
 static void pdf_write_obj (pdf_obj *object, FILE *file);
 
+static void pdf_flush_objstm (pdf_objstm *objstm);
+
 static void pdf_out_char (FILE *file, char c);
 static void pdf_out      (FILE *file, const void *buffer, long length);
 
@@ -186,8 +213,8 @@ static void release_dict (pdf_dict *dict);
 static void write_stream   (pdf_stream *stream, FILE *file);
 static void release_stream (pdf_stream *stream);
 
-static pdf_obj *pdf_ref_file_obj (unsigned long obj_num, unsigned obj_gen);
-static pdf_obj *pdf_read_object  (unsigned long obj_num, unsigned obj_gen);
+static pdf_obj *pdf_ref_file_obj (unsigned long obj_num, unsigned short obj_gen);
+static pdf_obj *pdf_read_object  (unsigned long obj_num, unsigned short obj_gen);
 
 static int  verbose = 0;
 static char compression_level = 9;
@@ -212,7 +239,7 @@ pdf_set_compression (int level)
   return;
 }
 
-static unsigned pdf_version = 3;
+static unsigned pdf_version = 4;
 
 void
 pdf_set_version (unsigned version)
@@ -235,12 +262,60 @@ pdf_obj_set_verbose(void)
   verbose++;
 }
 
+static pdf_objstm *current_objstm = NULL;
+
+void
+pdf_objstm_init ()
+{
+  if (pdf_version >= 5) {
+    current_objstm = NEW(1, pdf_objstm);
+    current_objstm->pos = 0;
+  }
+}
+
+void
+pdf_objstm_close ()
+{
+  if (current_objstm) {
+    RELEASE(current_objstm);
+    current_objstm = NULL;
+  }
+}
+
+static void
+add_xref_entry (unsigned long label, unsigned char type, unsigned long field2, unsigned short field3)
+{
+  if (label >= pdf_max_ind_objects) {
+    pdf_max_ind_objects = (label/IND_OBJECTS_ALLOC_SIZE+1)*IND_OBJECTS_ALLOC_SIZE;
+    output_xref = RENEW(output_xref, pdf_max_ind_objects, struct xref_entry);
+  }
+
+  output_xref[label].type   = type;
+  output_xref[label].field2 = field2;
+  output_xref[label].field3 = field3;
+}
+
 #define BINARY_MARKER "%\344\360\355\370\n"
 void
-pdf_out_init (const char *filename)
+pdf_out_init (const char *filename, int do_encryption)
 {
   char v;
 
+  output_xref = NULL;
+  pdf_max_ind_objects = 0;
+  add_xref_entry(0, 0, 0, 0xffff);
+  next_label = 1;
+
+  if (pdf_version >= 5) {
+    xref_stream = pdf_new_stream(STREAM_COMPRESS);
+    xref_stream->flags |= OBJ_NO_ENCRYPT;
+    trailer_dict = pdf_stream_dict(xref_stream);
+    pdf_add_dict(trailer_dict, pdf_new_name("Type"), pdf_new_name("XRef"));
+  } else
+    trailer_dict = pdf_new_dict();
+
+  output_stream = NULL;
+
   pdf_output_file = MFOPEN(filename, FOPEN_WBIN_MODE);
   if (!pdf_output_file) {
     if (strlen(filename) < 128)
@@ -253,94 +328,134 @@ pdf_out_init (const char *filename)
   pdf_out(pdf_output_file, &v, 1);
   pdf_out(pdf_output_file, "\n", 1);
   pdf_out(pdf_output_file, BINARY_MARKER, strlen(BINARY_MARKER));
+
+  enc_mode = 0;
+  doc_enc_mode = do_encryption;
 }
 
 static void
-dump_xref (void)
+dump_xref_table (void)
 {
   long length;
   unsigned long i;
 
-  /* Record where this xref is for trailer */
-  startxref = pdf_output_file_position;
-
   pdf_out(pdf_output_file, "xref\n", 5);
 
   length = sprintf(format_buffer, "%d %lu\n", 0, next_label);
   pdf_out(pdf_output_file, format_buffer, length);
 
-  length = sprintf(format_buffer, "%010ld %05ld f \n", 0L, 65535L);
   /*
    * Every space counts.  The space after the 'f' and 'n' is * *essential*.
    * The PDF spec says the lines must be 20 characters long including the
    * end of line character.
    */
-  pdf_out(pdf_output_file, format_buffer, length);
-  for (i = 1; i < next_label; i++){
-    length = sprintf(format_buffer, "%010ld %05ld n \n",
-		     output_xref[i-1].file_position, 0L);
+  for (i = 0; i < next_label; i++) {
+    unsigned char type = output_xref[i].type;
+    if (type > 1)
+      ERROR("object type %hu not allowed in xref table", type);
+    length = sprintf(format_buffer, "%010lu %05hu %c \n",
+		     output_xref[i].field2, output_xref[i].field3,
+		     type ? 'n' : 'f');
     pdf_out(pdf_output_file, format_buffer, length);
   }
-  /* Done with xref table */
-  RELEASE(output_xref);
-  output_xref = NULL;
 }
 
 static void
-dump_trailer (void)
+dump_trailer_dict (void)
 {
-  long length;
-  unsigned long starttrailer;
-
-  starttrailer = pdf_output_file_position;
-
   pdf_out(pdf_output_file, "trailer\n", 8);
-  pdf_out(pdf_output_file, "<<\n", 3);
-
-  length = sprintf(format_buffer, "/Size %lu\n", next_label);
-  pdf_out(pdf_output_file, format_buffer, length);
-
-  if (pdf_root_obj == 0) 
-    ERROR ("dump_trailer:  Invalid root object");
-  length = sprintf(format_buffer, "/Root %u %u R\n", pdf_root_obj, 0);
-  pdf_out(pdf_output_file, format_buffer, length);
+  enc_mode = 0;
+  write_dict(trailer_dict->data, pdf_output_file);
+  pdf_release_obj(trailer_dict);
+  pdf_out_char(pdf_output_file, '\n');
+}
 
-  if (pdf_encrypt_obj != 0) {
-    length = sprintf(format_buffer, "/Encrypt %u %u R\n", pdf_encrypt_obj, 0);
-    pdf_out(pdf_output_file, format_buffer, length);
-  }
-  if (pdf_info_obj != 0) {
-    length = sprintf(format_buffer, "/Info %u %u R\n", pdf_info_obj, 0);
-    pdf_out(pdf_output_file, format_buffer, length);
-  }
-  if (pdf_encrypt_obj != 0) {
-    unsigned char *id;
-    id = pdf_enc_id_string();
-    length = sprintf(format_buffer, "/ID [<%s> <%s>]\n", id, id);
-    pdf_out(pdf_output_file, format_buffer, length);
+/*
+ * output a PDF 1.5 cross-reference stream;
+ * contributed by Matthias Franz (March 21, 2007)
+ */
+static void
+dump_xref_stream (void)
+{
+  unsigned long pos, i;
+  unsigned poslen;
+  unsigned char buf[7] = {0, 0, 0, 0, 0};
+
+  pdf_obj *w;
+
+  pdf_label_obj(xref_stream);
+
+  /* determine the necessary size of the offset field */
+  pos = startxref; /* maximal offset value */
+  poslen = 1;
+  while (pos >>= 8)
+    poslen++;
+
+  w = pdf_new_array();
+  pdf_add_array(w, pdf_new_number(1));      /* type                */
+  pdf_add_array(w, pdf_new_number(poslen)); /* offset (big-endian) */
+  pdf_add_array(w, pdf_new_number(2));      /* generation          */
+  pdf_add_dict(trailer_dict, pdf_new_name("W"), w);
+
+  /* We need the xref entry for the xref stream right now */
+  add_xref_entry(next_label-1, 1, startxref, 0);
+
+  for (i = 0; i < next_label; i++) {
+    unsigned j;
+    buf[0] = output_xref[i].type;
+    pos = output_xref[i].field2;
+    for (j = poslen; j--; ) {
+      buf[1+j] = (unsigned char) pos;
+      pos >>= 8;
+    }
+    unsigned short f3 = output_xref[i].field3;
+    buf[poslen+1] = (unsigned char) (f3 >> 8);
+    buf[poslen+2] = (unsigned char) (f3);
+    pdf_add_stream(xref_stream, &buf, poslen+3);
   }
-  pdf_out(pdf_output_file, ">>\n", 3);
-  pdf_out(pdf_output_file, "startxref\n", 10);
-
-  length = sprintf(format_buffer, "%lu\n", startxref);
-  pdf_out(pdf_output_file, format_buffer, length);
 
-  pdf_out(pdf_output_file, "%%EOF\n", 6);
+  pdf_release_obj(xref_stream);
 }
 
 void
 pdf_out_flush (void)
 {
   if (pdf_output_file) {
-    dump_xref();
-    dump_trailer();
+    long length;
+
+    /* Flush current object stream */
+    if (current_objstm && current_objstm->pos)
+      pdf_flush_objstm(current_objstm);
+
+    /* Record where this xref is for trailer */
+    startxref = pdf_output_file_position;
+
+    pdf_add_dict(trailer_dict, pdf_new_name("Size"),
+		 pdf_new_number(next_label));
+
+    if (pdf_version >= 5)
+      dump_xref_stream();
+    else {
+      dump_xref_table();
+      dump_trailer_dict();
+    }
+
+    /* Done with xref table */
+    RELEASE(output_xref);
+
+    pdf_out(pdf_output_file, "startxref\n", 10);
+    length = sprintf(format_buffer, "%lu\n", startxref);
+    pdf_out(pdf_output_file, format_buffer, length);
+    pdf_out(pdf_output_file, "%%EOF\n", 6);
+
     MESG("\n");
     if (verbose) {
       if (compression_level > 0) {
-	MESG("Compression eliminated approximately %lu bytes\n", compression_saved);
+	MESG("Compression saved %ld bytes%s\n", compression_saved,
+	     pdf_version < 5 ? ". Try \"-V 5\" for better compression" : "");
       }
     }
-    MESG("%lu bytes written", pdf_output_file_position);
+    MESG("%ld bytes written", pdf_output_file_position);
 
     MFCLOSE(pdf_output_file);
   }
@@ -361,50 +476,52 @@ pdf_error_cleanup (void)
 void
 pdf_set_root (pdf_obj *object)
 {
-  if (pdf_root_obj != 0) {
+  if (pdf_add_dict(trailer_dict, pdf_new_name("Root"), pdf_ref_obj(object))) {
     ERROR("Root object already set!");
   }
-  if (object->label == 0) {  /* Make sure this object has a label */
-    pdf_label_obj(object);
-  }
-  pdf_root_obj = object->label;
+  /* Adobe Readers don't like a document catalog inside an encrypted
+   * object stream, although the PDF v1.5 spec seems to allow this.
+   * Note that we don't set OBJ_NO_ENCRYPT since the name dictionary in
+   * a document catalog may contain strings, which should be encrypted.
+   */
+  if (doc_enc_mode)
+    object->flags |= OBJ_NO_OBJSTM;
 }
 
 void
 pdf_set_info (pdf_obj *object)
 {
-  if (pdf_info_obj != 0) {
+  if (pdf_add_dict(trailer_dict, pdf_new_name("Info"), pdf_ref_obj(object))) {
     ERROR ("Info object already set!");
   }
-  if (object->label == 0) {  /* Make sure this object has a label */
-    pdf_label_obj(object);
-  }
-  pdf_info_obj = object->label;
 }
 
 void
-pdf_set_encrypt (pdf_obj *object)
+pdf_set_encrypt (pdf_obj *encrypt, pdf_obj *id)
 {
-  if (pdf_encrypt_obj != 0) {
+  if (pdf_add_dict(trailer_dict, pdf_new_name("Encrypt"), pdf_ref_obj(encrypt))) {
     ERROR("Encrypt object already set!");
   }
-  if (object->label == 0) {  /* Make sure this object has a label */
-    pdf_label_obj(object);
-  }
-  pdf_encrypt_obj = object->label;
+  encrypt->flags |= OBJ_NO_ENCRYPT;
+
+  pdf_add_dict(trailer_dict, pdf_new_name("ID"), id);
 }
 
 static
 void pdf_out_char (FILE *file, char c)
 {
-  fputc(c, file);
-  /* Keep tallys for xref table *only* if writing a pdf file. */
-  if (file == pdf_output_file) {
-    pdf_output_file_position += 1;
-    if (c == '\n')
-      pdf_output_line_position  = 0;
-    else
-      pdf_output_line_position += 1;
+  if (output_stream && file ==  pdf_output_file)
+    pdf_add_stream(output_stream, &c, 1);
+  else {
+    fputc(c, file);
+    /* Keep tallys for xref table *only* if writing a pdf file. */
+    if (file == pdf_output_file) {
+      pdf_output_file_position += 1;
+      if (c == '\n')
+        pdf_output_line_position  = 0;
+      else
+        pdf_output_line_position += 1;
+    }
   }
 }
 
@@ -419,15 +536,19 @@ void pdf_out_char (FILE *file, char c)
 static
 void pdf_out (FILE *file, const void *buffer, long length)
 {
-  fwrite(buffer, 1, length, file);
-  /* Keep tallys for xref table *only* if writing a pdf file */
-  if (file == pdf_output_file) {
-    pdf_output_file_position += length;
-    pdf_output_line_position += length;
-    /* "foo\nbar\n "... */
-    if (length > 0 &&
+  if (output_stream && file ==  pdf_output_file)
+    pdf_add_stream(output_stream, buffer, length);
+  else {
+    fwrite(buffer, 1, length, file);
+    /* Keep tallys for xref table *only* if writing a pdf file */
+    if (file == pdf_output_file) {
+      pdf_output_file_position += length;
+      pdf_output_line_position += length;
+      /* "foo\nbar\n "... */
+      if (length > 0 &&
 	((char *)buffer)[length-1] == '\n')
-      pdf_output_line_position = 0;
+        pdf_output_line_position = 0;
+    }
   }
 }
 
@@ -461,6 +582,7 @@ pdf_new_obj(int type)
   result->label      = 0;
   result->generation = 0;
   result->refcount   = 1;
+  result->flags      = 0;
 
   return result;
 }
@@ -480,20 +602,12 @@ pdf_label_obj (pdf_obj *object)
   if (INVALIDOBJ(object))
     ERROR("pdf_label_obj(): passed invalid object.");
 
-  if (next_label > pdf_max_ind_objects) {
-    pdf_max_ind_objects += IND_OBJECTS_ALLOC_SIZE;
-    output_xref = RENEW(output_xref, pdf_max_ind_objects, struct xref_entry);
-  }
   /*
    * Don't change label on an already labeled object. Ignore such calls.
    */
   if (object->label == 0) {
-    /* Save so we can lookup this object by its number */
-    output_xref[next_label-1].object = object;
-    output_xref[next_label-1].file_position = 0L;
-    object->label      = next_label;
+    object->label      = next_label++;
     object->generation = 0;
-    next_label++;
   }
 }
 
@@ -563,13 +677,13 @@ write_indirect (pdf_indirect *indirect, FILE *file)
   if (indirect->dirty) {
     if (file == stderr) {
       pdf_out(file, "{d}", 3);
-      length = sprintf(format_buffer, "%d %d R", indirect->label, indirect->generation);
+      length = sprintf(format_buffer, "%lu %hu R", indirect->label, indirect->generation);
       pdf_out(stderr, format_buffer, length);
     } else {
       pdf_obj *clean;
 
       if (indirect->dirty_file != pdf_input_file) {
-        ERROR("Input PDF file doesn't match object: label=%d, from_file=%p, current_file=%p",
+        ERROR("Input PDF file doesn't match object: label=%lu, from_file=%p, current_file=%p",
               indirect->label, indirect->dirty_file, pdf_input_file);
       }
       clean = pdf_ref_file_obj(indirect->label, indirect->generation);
@@ -577,7 +691,7 @@ write_indirect (pdf_indirect *indirect, FILE *file)
       pdf_release_obj(clean);
     }
   } else {
-    length = sprintf(format_buffer, "%d %d R", indirect->label, indirect->generation);
+    length = sprintf(format_buffer, "%lu %hu R", indirect->label, indirect->generation);
     pdf_out(file, format_buffer, length);
   }
 }
@@ -821,7 +935,10 @@ write_string (pdf_string *str, FILE *file)
   int  nescc = 0, i, count;
 
   s = str->string;
-  pdf_encrypt_data(s, str->length);
+
+  if (enc_mode)
+    pdf_encrypt_data(s, str->length);
+
   /*
    * Count all ASCII non-printable characters.
    */
@@ -1248,10 +1365,11 @@ release_dict (pdf_dict *data)
 }
 
 /* Array is ended by a node with NULL this pointer */
-void
+/* pdf_add_dict returns 0 if the key is new and non-zero otherwise */
+int
 pdf_add_dict (pdf_obj *dict, pdf_obj *key, pdf_obj *value)
 {
-  pdf_dict *data;
+  pdf_dict *data, *new_node;
 
   TYPECHECK(dict, PDF_DICT);
   TYPECHECK(key,  PDF_NAME);
@@ -1260,34 +1378,29 @@ pdf_add_dict (pdf_obj *dict, pdf_obj *key, pdf_obj *value)
   if (value != NULL && INVALIDOBJ(value))
     ERROR("pdf_add_dict(): Passed invalid value");
 
-  data = dict->data;
   /* If this key already exists, simply replace the value */
-  while (data->key != NULL) {
+  for (data = dict->data; data->key != NULL; data = data->next) {
     if (!strcmp(pdf_name_value(key), pdf_name_value(data->key))) {
       /* Release the old value */
       pdf_release_obj(data->value);
       /* Release the new key (we don't need it) */
       pdf_release_obj(key);
       data->value = value;
-      break;
+      return 1;
     }
-    data = data->next;
   }
   /*
-   * If we didn't find the key, build a new "end" node and add
+   * We didn't find the key. We build a new "end" node and add
    * the new key just before the end
    */
-  if (data->key == NULL) {
-    pdf_dict *new_node;
-
-    new_node = NEW (1, pdf_dict);
-    new_node->key = NULL;
-    new_node->value = NULL;
-    new_node->next = NULL;
-    data->next  = new_node;
-    data->key   = key;
-    data->value = value;
-  }
+  new_node = NEW (1, pdf_dict);
+  new_node->key = NULL;
+  new_node->value = NULL;
+  new_node->next = NULL;
+  data->next  = new_node;
+  data->key   = key;
+  data->value = value;
+  return 0;
 }
 
 void
@@ -1456,6 +1569,7 @@ pdf_new_stream (int flags)
   data->max_length    = 0;
 
   result->data = data;
+  result->flags |= OBJ_NO_OBJSTM;
 
   return result;
 }
@@ -1490,19 +1604,25 @@ write_stream (pdf_stream *stream, FILE *file)
       (stream->_flags & STREAM_COMPRESS) &&
       compression_level > 0) {
 
+    pdf_obj *filters = pdf_lookup_dict(stream->dict, "Filter");
+
     buffer_length = filtered_length + filtered_length/1000 + 14;
     buffer = NEW(buffer_length, unsigned char);
     {
-      pdf_obj *filters;
+      pdf_obj *filter_name = pdf_new_name("FlateDecode");
 
-      filters = pdf_lookup_dict(stream->dict, "Filter");
-      if (!filters)
-	filters = pdf_new_array();
-      /*
-       * FlateDecode is the first filter to be applied to the stream.
-       */
-      pdf_unshift_array(filters, pdf_new_name("FlateDecode"));
-      pdf_add_dict(stream->dict, pdf_new_name("Filter"), filters);
+      if (filters)
+        /*
+         * FlateDecode is the first filter to be applied to the stream.
+         */
+        pdf_unshift_array(filters, filter_name);
+      else
+        /*
+         * Adding the filter as a name instead of a one-element array
+         * is crucial because otherwise Adobe Reader cannot read the
+         * cross-reference stream any more, cf. the PDF v1.5 Errata.
+         */
+        pdf_add_dict(stream->dict, pdf_new_name("Filter"), filter_name);
     }
 #ifdef HAVE_ZLIB_COMPRESS2    
     if (compress2(buffer, &buffer_length, filtered,
@@ -1516,7 +1636,8 @@ write_stream (pdf_stream *stream, FILE *file)
     }
 #endif /* HAVE_ZLIB_COMPRESS2 */
     RELEASE(filtered);
-    compression_saved += filtered_length - buffer_length - strlen("/Filter [/FlateDecode]\n");
+    compression_saved += filtered_length - buffer_length
+      - (filters ? strlen("/FlateDecode "): strlen("/Filter/FlateDecode\n"));
 
     filtered        = buffer;
     filtered_length = buffer_length;
@@ -1541,7 +1662,10 @@ write_stream (pdf_stream *stream, FILE *file)
   pdf_write_obj(stream->dict, file);
 
   pdf_out(file, "\nstream\n", 8);
-  pdf_encrypt_data(filtered, filtered_length);
+
+  if (enc_mode)
+    pdf_encrypt_data(filtered, filtered_length);
+
   if (filtered_length > 0) {
     pdf_out(file, filtered, filtered_length);
   }
@@ -1700,11 +1824,12 @@ pdf_flush_obj (pdf_obj *object, FILE *file)
   long length;
 
   /*
-   * Record file position.  No object is numbered 0, so subtract 1
-   * when using as an array index
+   * Record file position
    */
-  output_xref[object->label-1].file_position = pdf_output_file_position;
-  length = sprintf(format_buffer, "%lu %d obj\n", object->label, object->generation);
+  add_xref_entry(object->label, 1,
+		 pdf_output_file_position, object->generation);
+  length = sprintf(format_buffer, "%lu %hu obj\n", object->label, object->generation);
+  enc_mode = doc_enc_mode && !(object->flags & OBJ_NO_ENCRYPT);
   pdf_enc_set_label(object->label);
   pdf_enc_set_generation(object->generation);
   pdf_out(file, format_buffer, length);
@@ -1712,6 +1837,64 @@ pdf_flush_obj (pdf_obj *object, FILE *file)
   pdf_out(file, "\nendobj\n", 8);
 }
 
+static void
+pdf_add_objstm (pdf_objstm *objstm, pdf_obj *object)
+{
+  unsigned char pos = objstm->pos++;
+
+  if (!pos) {
+    pdf_obj *stream = pdf_new_stream(STREAM_COMPRESS);
+    pdf_label_obj(stream);
+    objstm->stream = stream;
+  }
+  objstm->obj_label[pos] = object->label;
+  objstm->obj_pos[pos] = pdf_stream_length(objstm->stream);
+  
+  add_xref_entry(object->label, 2, objstm->stream->label, pos);
+  
+  output_stream = objstm->stream;
+  enc_mode = 0;
+  pdf_write_obj(object, pdf_output_file);
+  pdf_out_char(pdf_output_file, '\n');
+  output_stream = NULL;
+  
+  if (pos == OBJSTM_MAX_OBJS-1)
+    pdf_flush_objstm(objstm);
+}
+
+static void
+pdf_flush_objstm (pdf_objstm *objstm)
+{
+  unsigned char pos = objstm->pos;
+  pdf_obj *stream_obj = objstm->stream;
+  TYPECHECK(stream_obj, PDF_STREAM);
+  pdf_stream *stream = (pdf_stream *) stream_obj->data;
+
+  /* Precede stream data by offset table */
+  unsigned char *old_buf = stream->stream;
+  unsigned long old_length = stream->stream_length;
+  /* Reserve 22 bytes for each entry (two 10 digit numbers plus two spaces) */
+  stream->stream = NEW(old_length + 22*pos, unsigned char);
+  stream->stream_length = 0;
+  
+  unsigned char i;
+  for (i = 0; i < pos; i++) {
+    long length = sprintf(format_buffer, "%lu %lu ",
+			  objstm->obj_label[i], objstm->obj_pos[i]);
+    pdf_add_stream(stream_obj, format_buffer, length);
+  }
+
+  pdf_obj *dict = pdf_stream_dict(stream_obj);
+  pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("ObjStm"));
+  pdf_add_dict(dict, pdf_new_name("N"), pdf_new_number(pos));
+  pdf_add_dict(dict, pdf_new_name("First"), pdf_new_number(stream->stream_length));
+  
+  pdf_add_stream(stream_obj, old_buf, old_length);
+  RELEASE(old_buf);
+  pdf_release_obj(stream_obj);
+  objstm->pos = 0;
+}
+
 void
 pdf_release_obj (pdf_obj *object)
 {
@@ -1729,8 +1912,13 @@ pdf_release_obj (pdf_obj *object)
      * Nothing is using this object so it's okay to remove it.
      * Nonzero "label" means object needs to be written before it's destroyed.
      */
-    if (object->label && pdf_output_file != NULL) { 
-      pdf_flush_obj(object, pdf_output_file);
+    if (object->label && pdf_output_file != NULL) {
+      if (!current_objstm || object->flags & OBJ_NO_OBJSTM
+	  || (doc_enc_mode && object->flags & OBJ_NO_ENCRYPT)
+	  || object->generation)
+	pdf_flush_obj(object, pdf_output_file);
+      else
+	pdf_add_objstm(current_objstm, object);
     }
     switch (object->type) {
     case PDF_BOOLEAN:
@@ -2020,7 +2208,7 @@ next_object_offset (unsigned long obj_num)
  * returns the retained existing reference to that object
  */
 static pdf_obj *
-pdf_ref_file_obj (unsigned long obj_num, unsigned obj_gen)
+pdf_ref_file_obj (unsigned long obj_num, unsigned short obj_gen)
 {
   pdf_obj *obj, *ref;
 
@@ -2050,13 +2238,13 @@ pdf_ref_file_obj (unsigned long obj_num, unsigned obj_gen)
 
 
 pdf_obj *
-pdf_new_ref (unsigned long obj_num, int obj_gen) 
+pdf_new_ref (unsigned long obj_num, unsigned short obj_gen)
 {
   pdf_obj      *result;
   pdf_indirect *indirect;
 
   if (!checklabel(obj_num, obj_gen)) {
-    WARN("Invalid object label: %lu %d", obj_num, obj_gen);
+    WARN("Invalid object label: %lu %hu", obj_num, obj_gen);
     return NULL;
   }
   result   = pdf_new_obj(PDF_INDIRECT);
@@ -2075,7 +2263,7 @@ pdf_new_ref (unsigned long obj_num, int obj_gen)
  * be replaced with "null". But we won't do that.
  */ 
 static pdf_obj *
-pdf_read_object (unsigned long obj_num, unsigned obj_gen) 
+pdf_read_object (unsigned long obj_num, unsigned short obj_gen)
 {
   pdf_obj *result;
   long     offset, limit, length;
@@ -2362,7 +2550,7 @@ pdf_open (FILE *file)
   }
   pdf_input_file = file;
   if (!check_for_pdf(pdf_input_file)) {
-    WARN("pdf_open: Not a PDF 1.[1-3] file.");
+    WARN("pdf_open: Not a PDF 1.[1-5] file.");
     return NULL;
   }
   if ((trailer = read_xref()) == NULL) {
diff --git a/Build/source/texk/dvipdfmx/src/pdfobj.h b/Build/source/texk/dvipdfmx/src/pdfobj.h
index 9ca8df47b7e..346e38bd31b 100644
--- a/Build/source/texk/dvipdfmx/src/pdfobj.h
+++ b/Build/source/texk/dvipdfmx/src/pdfobj.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfobj.h,v 1.21 2005/05/04 16:10:06 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfobj.h,v 1.23 2007/11/14 03:36:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -51,10 +51,12 @@ typedef struct pdf_obj  pdf_obj;
 extern void     pdf_obj_set_verbose (void);
 extern void     pdf_error_cleanup   (void);
 
-extern void     pdf_out_init      (const char *filename);
+extern void     pdf_out_init      (const char *filename, int do_encryption);
 extern void     pdf_out_flush     (void);
 extern void     pdf_set_version   (unsigned version);
 extern unsigned pdf_get_version   (void);
+extern void     pdf_objstm_init   (void);
+extern void     pdf_objstm_close  (void);
 
 extern pdf_obj *pdf_new_obj     (int type);
 extern void     pdf_release_obj (pdf_obj *object);
@@ -124,7 +126,7 @@ extern pdf_obj *pdf_dict_keys   (pdf_obj *dict);
  * pdf_link_obj() it rather than allocate/free-ing them each time. But I
  * already removed that.
  */
-extern void     pdf_add_dict     (pdf_obj *dict, pdf_obj *key,    pdf_obj *value); 
+extern int      pdf_add_dict     (pdf_obj *dict, pdf_obj *key,    pdf_obj *value); 
 extern void     pdf_put_dict     (pdf_obj *dict, const char *key, pdf_obj *value); 
 
 /* Apply proc(key, value, pdata) for each key-value pairs in dict, stop if proc()
@@ -160,7 +162,7 @@ extern void      pdf_set_compression (int level);
 
 extern void      pdf_set_info     (pdf_obj *obj);
 extern void      pdf_set_root     (pdf_obj *obj);
-extern void      pdf_set_encrypt  (pdf_obj *obj);
+extern void      pdf_set_encrypt  (pdf_obj *encrypt, pdf_obj *id);
 
 extern int      check_for_pdf     (FILE *file);
 extern pdf_obj *pdf_open          (FILE *file);
@@ -171,7 +173,7 @@ extern pdf_obj *pdf_import_object (pdf_obj *object);
 
 extern int      pdfobj_escape_str (char *buffer, int size, const unsigned char *s, int len);
 
-extern pdf_obj *pdf_new_ref       (unsigned long label, int generation);
+extern pdf_obj *pdf_new_ref       (unsigned long label, unsigned short generation);
 extern void     pdf_copy_object   (pdf_obj *dst, pdf_obj *src);
 
 #endif  /* _PDFOBJ_H_ */
diff --git a/Build/source/texk/dvipdfmx/src/pdfparse.c b/Build/source/texk/dvipdfmx/src/pdfparse.c
index c7dc79a2990..f1c6a90a593 100644
--- a/Build/source/texk/dvipdfmx/src/pdfparse.c
+++ b/Build/source/texk/dvipdfmx/src/pdfparse.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfparse.c,v 1.39 2005/07/21 05:05:14 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfparse.c,v 1.40 2007/04/03 05:11:39 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -952,7 +952,8 @@ parse_pdf_reference (char **start, char *end)
 static pdf_obj *
 try_pdf_reference (char *start, char *end, char **endptr)
 {
-  unsigned long id = 0, gen = 0;
+  unsigned long id = 0;
+  unsigned short gen = 0;
 
   if (endptr)
     *endptr = start;
@@ -989,7 +990,7 @@ try_pdf_reference (char *start, char *end, char **endptr)
   if (endptr)
     *endptr = start;
 
-  return pdf_new_ref(id, (int) gen);
+  return pdf_new_ref(id, gen);
 }
 
 pdf_obj *
diff --git a/Build/source/texk/dvipdfmx/src/pdfximage.c b/Build/source/texk/dvipdfmx/src/pdfximage.c
index 9cc8ccdb49b..a6e0da46658 100644
--- a/Build/source/texk/dvipdfmx/src/pdfximage.c
+++ b/Build/source/texk/dvipdfmx/src/pdfximage.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfximage.c,v 1.14 2005/07/30 11:44:18 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfximage.c,v 1.16 2007/05/18 05:19:01 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -63,6 +63,7 @@ static int  ps_include_page (pdf_ximage *ximage, const char *file_name);
 struct attr_
 {
   long     width, height;
+  double   xdensity, ydensity;
   pdf_rect bbox;
 };
 
@@ -116,6 +117,7 @@ pdf_init_ximage_struct (pdf_ximage *I)
   I->resource  = NULL;
 
   I->attr.width = I->attr.height = 0;
+  I->attr.xdensity = I->attr.ydensity = 1.0;
   I->attr.bbox.llx = I->attr.bbox.lly = 0;
   I->attr.bbox.urx = I->attr.bbox.ury = 0;
 }
@@ -399,6 +401,20 @@ pdf_ximage_findresource (const char *ident)
   return  id;
 }
 
+/* Reference: PDF Reference 1.5 v6, pp.321--322
+ *
+ * TABLE 4.42 Additional entries specific to a type 1 form dictionary
+ *
+ * BBox rectangle (Required) An array of four numbers in the form coordinate
+ *                system, giving the coordinates of the left, bottom, right,
+ *                and top edges, respectively, of the form XObject's bounding
+ *                box. These boundaries are used to clip the form XObject and
+ *                to determine its size for caching.
+ *
+ * Matrix array   (Optional) An array of six numbers specifying the form
+ *                matrix, which maps form space into user space.
+ *                Default value: the identity matrix [1 0 0 1 0 0].
+ */
 void
 pdf_ximage_init_form_info (xform_info *info)
 {
@@ -415,6 +431,36 @@ pdf_ximage_init_form_info (xform_info *info)
   info->matrix.f = 0.0;
 }
 
+/* Reference: PDF Reference 1.5 v6, pp.303--306
+ *
+ * TABLE 4.42 Additional entries specific to an image dictionary
+ *
+ * Width integer  (Required) The width of the image, in samples.
+ *
+ * Height integer (Required) The height of the image, in samples.
+ *
+ * ColorSpace name or array
+ *                (Required for images, except those that use the JPXDecode
+ *                filter; not allowed for image masks) The color space in
+ *                which image samples are specified. This may be any type
+ *                of color space except Patter.
+ *
+ *                If the image uses the JPXDecode filter, this entry is
+ *                optional.
+ *
+ * BitsPerComponent integer
+ *                (Required except for image masks and images that use the
+ *                JPXDecode filter) The number of bits used to represent
+ *                each color component. Only a single value may be specified;
+ *                the number of bits is the same for all color components.
+ *                Valid values are 1,2,4,8, and (in PDF1.5) 16. If ImageMask
+ *                is true, this entry is optional, and if speficified, its
+ *                value must be 1.
+ *
+ *                If the image stream uses the JPXDecode filter, this entry
+ *                is optional and ignored if present. The bit depth is
+ *                determined in the process of decoding the JPEG2000 image.
+ */
 void
 pdf_ximage_init_image_info (ximage_info *info)
 {
@@ -424,6 +470,7 @@ pdf_ximage_init_image_info (ximage_info *info)
   info->bits_per_component = 0;
   info->num_components = 0;
   info->min_dpi = 0;
+  info->xdensity = info->ydensity = 1.0;
 }
 
 void
@@ -433,12 +480,14 @@ pdf_ximage_set_image (pdf_ximage *I, void *image_info, pdf_obj *resource)
   ximage_info *info = image_info;
 
   if (!PDF_OBJ_STREAMTYPE(resource))
-    ERROR("Image XObject must be stream type.");
+    ERROR("Image XObject must be of stream type.");
 
   I->subtype = PDF_XOBJECT_TYPE_IMAGE;
 
-  I->attr.width  = info->width;
-  I->attr.height = info->height;
+  I->attr.width  = info->width;  /* The width of the image, in samples */
+  I->attr.height = info->height; /* The height of the image, in samples */
+  I->attr.xdensity = info->xdensity;
+  I->attr.ydensity = info->ydensity;
 
   I->reference = pdf_ref_obj(resource);
 
@@ -455,17 +504,19 @@ pdf_ximage_set_image (pdf_ximage *I, void *image_info, pdf_obj *resource)
 }
 
 void
-pdf_ximage_set_form (pdf_ximage *I,  void *form_info, pdf_obj *resource)
+pdf_ximage_set_form (pdf_ximage *I, void *form_info, pdf_obj *resource)
 {
-  xform_info  *info = form_info;
+  xform_info *info = form_info;
 
   I->subtype   = PDF_XOBJECT_TYPE_FORM;
+
   I->attr.bbox.llx = info->bbox.llx;
   I->attr.bbox.lly = info->bbox.lly;
   I->attr.bbox.urx = info->bbox.urx;
   I->attr.bbox.ury = info->bbox.ury;
 
   I->reference = pdf_ref_obj(resource);
+
   pdf_release_obj(resource); /* Caller don't know we are using reference. */
   I->resource  = NULL;
 }
@@ -481,8 +532,8 @@ pdf_ximage_set_form (pdf_ximage *I,  void *form_info, pdf_obj *resource)
 pdf_obj *
 pdf_ximage_get_reference (int id)
 {
-  struct ic_  *ic = &_ic;
-  pdf_ximage  *I;
+  struct ic_ *ic = &_ic;
+  pdf_ximage *I;
 
   CHECK_ID(ic, id);
 
@@ -490,16 +541,17 @@ pdf_ximage_get_reference (int id)
   if (!I->reference)
     I->reference = pdf_ref_obj(I->resource);
 
-  return  pdf_link_obj(I->reference);
+  return pdf_link_obj(I->reference);
 }
 
+/* called from pdfdoc.c only for late binding */
 int
 pdf_ximage_defineresource (const char *ident,
 			   int subtype, void *info, pdf_obj *resource)
 {
-  struct ic_  *ic = &_ic;
-  int          id;
-  pdf_ximage  *I;
+  struct ic_ *ic = &_ic;
+  int         id;
+  pdf_ximage *I;
 
   id = ic->count;
   if (ic->count >= ic->capacity) {
@@ -518,12 +570,10 @@ pdf_ximage_defineresource (const char *ident,
   switch (subtype) {
   case PDF_XOBJECT_TYPE_IMAGE:
     pdf_ximage_set_image(I, info, resource);
-    I->subtype = PDF_XOBJECT_TYPE_IMAGE;
     sprintf(I->res_name, "Im%d", id);
     break;
   case PDF_XOBJECT_TYPE_FORM:
     pdf_ximage_set_form (I, info, resource);
-    I->subtype = PDF_XOBJECT_TYPE_FORM;
     sprintf(I->res_name, "Fm%d", id);
     break;
   default:
@@ -538,14 +588,14 @@ pdf_ximage_defineresource (const char *ident,
 char *
 pdf_ximage_get_resname (int id)
 {
-  struct ic_  *ic = &_ic;
-  pdf_ximage  *I;
+  struct ic_ *ic = &_ic;
+  pdf_ximage *I;
 
   CHECK_ID(ic, id);
 
   I = GET_IMAGE(ic, id);
 
-  return  I->res_name;
+  return I->res_name;
 }
 
 
@@ -554,47 +604,61 @@ pdf_ximage_get_resname (int id)
  * not as vertical dimension of scaled image. (And there are bugs.)
  * This part contains incompatibile behaviour than dvipdfm!
  */
-#define EBB_DPI 100
+#define EBB_DPI 72
+
 static void
 scale_to_fit_I (pdf_tmatrix    *T,
                 transform_info *p,
                 pdf_ximage     *I)
 {
-  double  s_x, s_y;
-  long    wdx = I->attr.width;
-  long    htx = I->attr.height;
-  double  ar, dp;
+  double  s_x, s_y, d_x, d_y;
+  double  wd0, ht0, dp, xscale, yscale;
 
-  if (htx == 0) {
-    WARN("Image height=0!");
-    htx = 1;
+  if (p->flags & INFO_HAS_USER_BBOX) {
+    wd0 =  p->bbox.urx - p->bbox.llx;
+    ht0 =  p->bbox.ury - p->bbox.lly;
+    xscale = I->attr.width * I->attr.xdensity / wd0;
+    yscale = I->attr.height * I->attr.ydensity / ht0;
+    d_x = -p->bbox.llx / wd0;
+    d_y = -p->bbox.lly / ht0;
+  } else {
+    wd0 = I->attr.width * I->attr.xdensity;
+    ht0 = I->attr.height * I->attr.ydensity;
+    xscale = yscale = 1.0;
+    d_x = 0.0;
+    d_y = 0.0; 
   }
 
-  ar = (double) wdx / htx;
+  if (wd0 == 0.0) {
+    WARN("Image width=0.0!");
+    wd0 = 1.0;
+  }
+  if (ht0 == 0.0) {
+    WARN("Image height=0.0!");
+    ht0 = 1.0;
+  }
 
-  /* only width/height --> uniform (keep aspect ratio)
-   * no width-height   --> uniform with 72dpi implied (?)
-   * both width-height --> non-uniform
-   */
   if ( (p->flags & INFO_HAS_WIDTH ) &&
        (p->flags & INFO_HAS_HEIGHT) ) {
-    s_x = p->width; s_y = p->height + p->depth;
-    dp  = p->depth;
-  } else if ( p->flags & INFO_HAS_WIDTH  ) {
-    s_x = p->width; s_y = s_x / ar;
+    s_x = p->width * xscale;
+    s_y = (p->height + p->depth) * yscale;
+    dp  = p->depth * yscale;
+  } else if ( p->flags & INFO_HAS_WIDTH ) {
+    s_x = p->width * xscale;
+    s_y = s_x * ((double)I->attr.height / I->attr.width);
     dp  = 0.0;
-  } else if ( p->flags & INFO_HAS_HEIGHT ) {
-    s_y = p->height + p->depth; s_x = s_y * ar;
-    dp  = p->depth;
+  } else if ( p->flags & INFO_HAS_HEIGHT) {
+    s_y = (p->height + p->depth) * yscale;
+    s_x = s_y * ((double)I->attr.width / I->attr.height);
+    dp  = p->depth * yscale;
   } else {
-    s_x = wdx * 72.0 / EBB_DPI;
-    s_y = htx * 72.0 / EBB_DPI;
+    s_x = wd0;
+    s_y = ht0;
     dp  = 0.0;
   }
-
-  T->a   = s_x;  T->c  = 0.0;
-  T->b   = 0.0;  T->d  = s_y;
-  T->e   = 0.0;  T->f  = -dp;
+  T->a = s_x; T->c = 0.0;
+  T->b = 0.0; T->d = s_y;
+  T->e = d_x * s_x / xscale; T->f = d_y * s_y / yscale - dp;
 
   return;
 }
@@ -655,15 +719,16 @@ scale_to_fit_F (pdf_tmatrix    *T,
 }
 
 
+/* called from pdfdev.c and spc_html.c */
 int
 pdf_ximage_scale_image (int            id,
-                        pdf_tmatrix    *M, /* ret */
-                        pdf_rect       *r, /* ret */
-                        transform_info *p  /* arg */
+                        pdf_tmatrix    *M, /* return value for trans matrix */
+                        pdf_rect       *r, /* return value for clipping */
+                        transform_info *p  /* argument from specials */
                        )
 {
-  struct ic_  *ic = &_ic;
-  pdf_ximage  *I;
+  struct ic_ *ic = &_ic;
+  pdf_ximage *I;
 
   CHECK_ID(ic, id);
 
@@ -672,13 +737,47 @@ pdf_ximage_scale_image (int            id,
   pdf_setmatrix(M, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
 
   switch (I->subtype) {
+  /* Reference: PDF Reference 1.5 v6, p.302
+   *
+   * An image can be placed on the output page in any desired position,
+   * orientation, and size by using the cm operator to modify the current
+   * transformation matrix (CTM) so as to map the unit square of user space
+   * to the rectangle or parallelogram in which the image is to be painted.
+   *
+   * There is neither BBox nor Matrix key in the image XObject.
+   * Everything must be controlled by the cm operator.
+   *
+   * The argument [p] contains the user-defined bounding box, the scailing
+   * factor of which is bp as EPS and PDF. On the other hand, I->attr
+   * contains the (sampling) width and the (sampling) height of the image.
+   *
+   * There is no problem if a bitmap image has density information.
+   * Otherwise, DVIPDFM's ebb generates bounding box as 100px = 72bp = 1in.
+   * In this case, screen captured images look bad. Moreover, DVIPDFM's ebb
+   * ignores all density information and use just 100px = 72bp = 1in.
+   *
+   * On the other hand, pdfTeX uses 100px = 100bp to get a better quality
+   * for screen captured images.
+   *
+   * DVIPDFMx's xbb generates bounding box as 100px = 100bp in the same
+   * way as pdfTeX. Furthermore, it takes care of density information too.
+   */
   case PDF_XOBJECT_TYPE_IMAGE:
     scale_to_fit_I(M, p, I);
-    r->llx = 0.0;
-    r->lly = 0.0;
-    r->urx = M->a;
-    r->ury = M->d;
+    if (p->flags & INFO_HAS_USER_BBOX) {
+      r->llx = p->bbox.llx / (I->attr.width * I->attr.xdensity);
+      r->lly = p->bbox.lly / (I->attr.height * I->attr.ydensity);
+      r->urx = p->bbox.urx / (I->attr.width * I->attr.xdensity);
+      r->ury = p->bbox.ury / (I->attr.height * I->attr.ydensity);
+    } else {
+      r->llx = 0.0;
+      r->lly = 0.0;
+      r->urx = 1.0;
+      r->ury = 1.0;
+    }
     break;
+  /* User-defined transformation and clipping are controlled by
+   * the cm operator and W operator, explicitly */
   case PDF_XOBJECT_TYPE_FORM:
     scale_to_fit_F(M, p, I);
     if (p->flags & INFO_HAS_USER_BBOX) {
@@ -686,7 +785,7 @@ pdf_ximage_scale_image (int            id,
       r->lly = p->bbox.lly;
       r->urx = p->bbox.urx;
       r->ury = p->bbox.ury;
-    } else {
+    } else { /* I->attr.bbox from the image bounding box */
       r->llx = I->attr.bbox.llx;
       r->lly = I->attr.bbox.lly;
       r->urx = I->attr.bbox.urx;
@@ -781,5 +880,3 @@ static int check_for_ps (FILE *image_file)
     return 1;
   return 0;
 }
-
-
diff --git a/Build/source/texk/dvipdfmx/src/pdfximage.h b/Build/source/texk/dvipdfmx/src/pdfximage.h
index 2a51a9fbfc5..e66b17120f5 100644
--- a/Build/source/texk/dvipdfmx/src/pdfximage.h
+++ b/Build/source/texk/dvipdfmx/src/pdfximage.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfximage.h,v 1.8 2005/07/30 11:44:18 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfximage.h,v 1.10 2007/05/18 05:19:01 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -40,6 +40,8 @@ typedef struct {
   int  num_components;
 
   long min_dpi; /* NOT USED YET */
+
+  double xdensity, ydensity; /* scale factor for bp */
 } ximage_info;
 
 typedef struct {
@@ -80,4 +82,6 @@ pdf_ximage_scale_image (int            id,
                         transform_info *p  /* arg */
                        );
 
+/* from dvipdfmx.c */
+extern void pdf_ximage_disable_ebb (void);
 #endif /* _PDFXIMAGE_H_ */
diff --git a/Build/source/texk/dvipdfmx/src/pkfont.c b/Build/source/texk/dvipdfmx/src/pkfont.c
index e081705addb..4822d50bc71 100644
--- a/Build/source/texk/dvipdfmx/src/pkfont.c
+++ b/Build/source/texk/dvipdfmx/src/pkfont.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pkfont.c,v 1.16 2005/08/12 18:22:24 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pkfont.c,v 1.17 2007/11/14 03:12:21 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -127,6 +127,7 @@ pdf_font_open_pkfont (pdf_font *font)
   pdf_font_set_fontname(font, ident);
 
   if (encoding_id >= 0) {
+    pdf_encoding_used_by_type3(encoding_id);
     WARN("PK font is found for font \"%s\" but non built-in encoding \"%s\" is specified.",
          ident, pdf_encoding_get_name(encoding_id));
 #if  ENABLE_GLYPHENC
@@ -636,7 +637,7 @@ pdf_font_load_pkfont (pdf_font *font)
 #if  ENABLE_GLYPHENC
         if (encoding_id >= 0 && enc_vec) {
           charname = (char *) enc_vec[pkh.chrcode & 0xff];
-          if (!charname || !strcmp(charname, ".notdef")) {
+          if (!charname) {
             WARN("\".notdef\" glyph used in font (code=0x%02x): %s", pkh.chrcode, ident);
             charname = work_buffer;
             pk_char2name(charname, pkh.chrcode);
@@ -711,7 +712,7 @@ pdf_font_load_pkfont (pdf_font *font)
 #if  ENABLE_GLYPHENC
       if (encoding_id >= 0 && enc_vec) {
         charname = (char *) enc_vec[(unsigned char) code];
-        if (!charname || !strcmp(charname, ".notdef")) {
+        if (!charname) {
           charname = work_buffer;
           pk_char2name(charname, code);
         }
@@ -732,14 +733,20 @@ pdf_font_load_pkfont (pdf_font *font)
     pdf_release_obj(tmp_array);
     return  -1;
   }
-  encoding  = pdf_new_dict();
-  pdf_add_dict(encoding,
-               pdf_new_name("Type"), pdf_new_name("Encoding"));
-  pdf_add_dict(encoding,
-               pdf_new_name("Differences"), tmp_array);
-  pdf_add_dict(fontdict,
-               pdf_new_name("Encoding"),    pdf_ref_obj(encoding));
-  pdf_release_obj(encoding);
+#if  ENABLE_GLYPHENC
+  if (encoding_id < 0 || !enc_vec) {
+#else
+  if (1) {
+#endif /* ENABLE_GLYPHENC */
+    encoding  = pdf_new_dict();
+    pdf_add_dict(encoding,
+		 pdf_new_name("Type"), pdf_new_name("Encoding"));
+    pdf_add_dict(encoding,
+		 pdf_new_name("Differences"), tmp_array);
+    pdf_add_dict(fontdict,
+		 pdf_new_name("Encoding"),    pdf_ref_obj(encoding));
+    pdf_release_obj(encoding);
+  }
 
   /* FontBBox: Accurate value is important.
    */
@@ -782,10 +789,8 @@ pdf_font_load_pkfont (pdf_font *font)
                pdf_new_name("LastChar"),  pdf_new_number(lastchar));
 
 #if  ENABLE_GLYPHENC
-  /* ToUnicode */
   if (encoding_id >= 0) {
-    if (!pdf_lookup_dict(fontdict, "ToUnicode"))
-      pdf_attach_ToUnicode_CMap(fontdict, encoding_id, usedchars);
+    pdf_encoding_add_usedchars(encoding_id, usedchars);
   }
 #endif /* ENABLE_GLYPHENC */
 
diff --git a/Build/source/texk/dvipdfmx/src/pngimage.c b/Build/source/texk/dvipdfmx/src/pngimage.c
index 39509976bc7..f7eb4ba3513 100644
--- a/Build/source/texk/dvipdfmx/src/pngimage.c
+++ b/Build/source/texk/dvipdfmx/src/pngimage.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pngimage.c,v 1.24 2004/09/11 14:50:29 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pngimage.c,v 1.25 2007/05/18 05:19:01 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -165,7 +165,7 @@ png_include_image (pdf_ximage *ximage, FILE *png_file)
   png_structp png_ptr;
   png_infop   png_info_ptr;
   png_byte    bpc, color_type;
-  png_uint_32 width, height, rowbytes;
+  png_uint_32 width, height, rowbytes, xppm, yppm;
 
   pdf_ximage_init_image_info(&info);
 
@@ -192,6 +192,8 @@ png_include_image (pdf_ximage *ximage, FILE *png_file)
   width      = png_get_image_width (png_ptr, png_info_ptr);
   height     = png_get_image_height(png_ptr, png_info_ptr);
   bpc        = png_get_bit_depth   (png_ptr, png_info_ptr);
+  xppm       = png_get_x_pixels_per_meter(png_ptr, png_info_ptr);
+  yppm       = png_get_y_pixels_per_meter(png_ptr, png_info_ptr);
 
   /* We do not need 16-bpc color. Ask libpng to convert down to 8-bpc. */
   if (bpc > 8) {
@@ -211,6 +213,10 @@ png_include_image (pdf_ximage *ximage, FILE *png_file)
   info.width  = width;
   info.height = height;
   info.bits_per_component = bpc;
+  if (xppm > 0)
+    info.xdensity = 72.0 / 0.0254 / xppm;
+  if (yppm > 0)
+    info.ydensity = 72.0 / 0.0254 / yppm;
 
   stream_data_ptr = (png_bytep) NEW(rowbytes*height, png_byte);
   read_image_data(png_ptr, png_info_ptr, stream_data_ptr, height, rowbytes);
diff --git a/Build/source/texk/dvipdfmx/src/spc_html.c b/Build/source/texk/dvipdfmx/src/spc_html.c
index 912839179d1..d2ba4140518 100644
--- a/Build/source/texk/dvipdfmx/src/spc_html.c
+++ b/Build/source/texk/dvipdfmx/src/spc_html.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/spc_html.c,v 1.5 2005/08/14 15:50:36 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/spc_html.c,v 1.6 2007/01/19 11:00:48 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
diff --git a/Build/source/texk/dvipdfmx/src/spc_pdfm.c b/Build/source/texk/dvipdfmx/src/spc_pdfm.c
index 8681af2586b..67a66dba7c5 100644
--- a/Build/source/texk/dvipdfmx/src/spc_pdfm.c
+++ b/Build/source/texk/dvipdfmx/src/spc_pdfm.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/spc_pdfm.c,v 1.24 2006/12/11 12:46:03 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/spc_pdfm.c,v 1.26 2007/04/25 09:44:49 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -765,11 +765,29 @@ spc_handler_pdfm_outline (struct spc_env *spe, struct spc_arg *args)
 {
   struct spc_pdf_ *sd = &_pdf_stat;
   pdf_obj   *item_dict, *tmp;
-  int        level;
+  int        level, is_open = -1;
   int        current_depth;
 
   skip_white(&args->curptr, args->endptr);
 
+  /*
+   * pdf:outline is extended to support open/close feature
+   *
+   * pdf:outline 1 ... (as DVIPDFM)
+   * pdf:outline [] 1 ... (open bookmark)
+   * pdf:outline [-] 1 ... (closed bookmark)
+   */
+  if (args->curptr+3 < args->endptr && *args->curptr == '[') {
+    args->curptr++;
+    if (*args->curptr == '-') {
+      args->curptr++;
+    } else {
+      is_open = 1;
+    }
+    args->curptr++;
+  }
+  skip_white(&args->curptr, args->endptr);
+
   tmp = parse_pdf_object(&args->curptr, args->endptr);
   if (!tmp) {
     spc_warn(spe, "Missing number for outline item depth.");
@@ -815,7 +833,7 @@ spc_handler_pdfm_outline (struct spc_env *spe, struct spc_arg *args)
       pdf_doc_bookmarks_down();
   }
 
-  pdf_doc_bookmarks_add(item_dict, -1); /* Use global setting for open/close */
+  pdf_doc_bookmarks_add(item_dict, is_open);
 
   return  0;
 }
diff --git a/Build/source/texk/dvipdfmx/src/spc_util.c b/Build/source/texk/dvipdfmx/src/spc_util.c
index e2d86eded94..ad53e6d0b95 100644
--- a/Build/source/texk/dvipdfmx/src/spc_util.c
+++ b/Build/source/texk/dvipdfmx/src/spc_util.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/spc_util.c,v 1.7 2005/08/12 16:27:52 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/spc_util.c,v 1.8 2007/04/24 09:29:39 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -636,6 +636,7 @@ spc_util_read_dimtrns (struct spc_env *spe, transform_info *ti, struct spc_arg *
 #ifdef  cmyk
 #undef  cmyk
 #endif
+#define gray(g)       {1, {g}}
 #define rgb8(r,g,b)   {3, {((r)/255.0), ((g)/255.0), ((b)/255.0), 0.0}}
 #define cmyk(c,m,y,k) {4, {(c), (m), (y), (k)}}
 
@@ -709,9 +710,13 @@ static struct colordef_
   {"Sepia",          cmyk(0.00, 0.83, 1.00, 0.70)},
   {"Brown",          cmyk(0.00, 0.81, 1.00, 0.60)},
   {"Tan",            cmyk(0.14, 0.42, 0.56, 0.00)},
-  {"Gray",           cmyk(0.00, 0.00, 0.00, 0.50)},
-  {"Black",          cmyk(0.00, 0.00, 0.00, 1.00)},
-  {"White",          cmyk(0.00, 0.00, 0.00, 0.00)},
+  /* Adobe Reader 7 and 8 had problem when gray and cmyk black colors
+   * are mixed. No problem with Previewer.app.
+   * It happens when \usepackage[dvipdfm]{graphicx} and then called
+   * \usepackage{color} without dvipdfm option. */
+  {"Gray",           gray(0.5)},
+  {"Black",          gray(0.0)},
+  {"White",          gray(1.0)},
   {NULL}
 };
 
diff --git a/Build/source/texk/dvipdfmx/src/specials.h b/Build/source/texk/dvipdfmx/src/specials.h
index 2be14952ea9..8cd2ceda1bf 100644
--- a/Build/source/texk/dvipdfmx/src/specials.h
+++ b/Build/source/texk/dvipdfmx/src/specials.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/specials.h,v 1.3 2005/07/31 16:44:42 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/specials.h,v 1.4 2007/01/20 23:53:20 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
diff --git a/Build/source/texk/dvipdfmx/src/subfont.c b/Build/source/texk/dvipdfmx/src/subfont.c
index 7d7927e36b5..5ba8600d56f 100644
--- a/Build/source/texk/dvipdfmx/src/subfont.c
+++ b/Build/source/texk/dvipdfmx/src/subfont.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/subfont.c,v 1.20 2005/07/28 13:19:00 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/subfont.c,v 1.21 2007/11/14 03:36:01 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -454,8 +454,7 @@ lookup_sfd_record (int rec_id, unsigned char c)
   return sfd_record[rec_id].vector[c];
 }
 
-#if  0
-static void
+void
 release_sfd_record (void)
 {
   int  i;
@@ -474,7 +473,6 @@ release_sfd_record (void)
   num_sfd_records = max_sfd_records = 0;
   num_sfd_files = max_sfd_files = 0;
 }
-#endif /* 0 */
 
 
 #if  DPXTEST
diff --git a/Build/source/texk/dvipdfmx/src/subfont.h b/Build/source/texk/dvipdfmx/src/subfont.h
index e1c6010d5bc..1d90c21ef65 100644
--- a/Build/source/texk/dvipdfmx/src/subfont.h
+++ b/Build/source/texk/dvipdfmx/src/subfont.h
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/subfont.h,v 1.8 2005/07/17 09:53:38 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/subfont.h,v 1.9 2007/11/14 03:36:01 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -25,6 +25,8 @@
 
 extern void   subfont_set_verbose (void);
 
+extern void   release_sfd_record  (void);
+
 extern unsigned short lookup_sfd_record(int rec_id, unsigned char code);
 
 extern int    sfd_load_record     (const char *sfd_name, const char *subfont_id);
diff --git a/Build/source/texk/dvipdfmx/src/truetype.c b/Build/source/texk/dvipdfmx/src/truetype.c
index 76b7ba3666a..c9b27405399 100644
--- a/Build/source/texk/dvipdfmx/src/truetype.c
+++ b/Build/source/texk/dvipdfmx/src/truetype.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/truetype.c,v 1.5 2005/12/29 04:07:04 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/truetype.c,v 1.6 2007/11/14 03:12:21 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -126,7 +126,7 @@ pdf_font_open_truetype (pdf_font *font)
   if (!embedding) {
     if (encoding_id >= 0 &&
         !pdf_encoding_is_predefined(encoding_id)) {
-      ERROR("Custum encoding not allowed for non-embedded TrueType font.");
+      ERROR("Custom encoding not allowed for non-embedded TrueType font.");
       sfnt_close(sfont);
       return -1;
     } else {
@@ -184,19 +184,6 @@ pdf_font_open_truetype (pdf_font *font)
   pdf_add_dict(fontdict,
                pdf_new_name("Subtype"), pdf_new_name("TrueType"));
 
-  /*
-   * We use MacRoman as "default" encoding.
-   */
-  if (encoding_id >= 0)
-    pdf_add_dict(fontdict,
-                 pdf_new_name("Encoding"),
-                 pdf_new_name(pdf_encoding_get_name(encoding_id)));
-  else {
-    pdf_add_dict(fontdict,
-                 pdf_new_name("Encoding"),
-                 pdf_new_name("MacRomanEncoding"));
-  }
-
   return  0;
 }
 
@@ -761,7 +748,7 @@ clean_glyph_mapper (struct glyph_mapper *gm)
 }
 
 static int
-do_custum_encoding (pdf_font *font,
+do_custom_encoding (pdf_font *font,
                     char **encoding, const char *usedchars, sfnt *sfont)
 {
   struct tt_glyphs      *glyphs;
@@ -881,13 +868,6 @@ pdf_font_load_truetype (pdf_font *font)
 
   verbose = pdf_font_get_verbose();
 
-  if (!pdf_lookup_dict(fontdict, "ToUnicode")) {
-    if (encoding_id >= 0)
-      pdf_attach_ToUnicode_CMap(fontdict,
-                                encoding_id, usedchars);
-     /* encoding_id < 0 means MacRoman here (but not really) */
-  }
-
   fp = DPXFOPEN(ident, DPX_RES_TYPE_TTFONT);
   if (!fp)
     ERROR("Unable to open TrueType font file: %s", ident); /* Should find *truetype* here */
@@ -924,7 +904,7 @@ pdf_font_load_truetype (pdf_font *font)
     error = do_builtin_encoding(font, usedchars, sfont);
   else {
     enc_vec  = pdf_encoding_get_encoding(encoding_id);
-    error = do_custum_encoding(font, enc_vec, usedchars, sfont);
+    error = do_custom_encoding(font, enc_vec, usedchars, sfont);
   }
   if (error) {
     ERROR("Error occured while creating font subfont for \"%s\"", ident);
diff --git a/Build/source/texk/dvipdfmx/src/tt_cmap.c b/Build/source/texk/dvipdfmx/src/tt_cmap.c
index 74b1764397c..e938e61b80d 100644
--- a/Build/source/texk/dvipdfmx/src/tt_cmap.c
+++ b/Build/source/texk/dvipdfmx/src/tt_cmap.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/tt_cmap.c,v 1.24 2005/07/08 14:18:05 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/tt_cmap.c,v 1.25 2007/04/13 06:48:03 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -1088,20 +1088,27 @@ otf_create_ToUnicode_stream (const char *font_name,
   }
 
   CMap_set_silent(1); /* many warnings without this... */
-  ttcmap = tt_cmap_read(sfont, 3, 10); /* UCS4 */
+  ttcmap = tt_cmap_read(sfont, 3, 10); /* Microsoft UCS4 */
   if (ttcmap &&
       ttcmap->format == 12) {
     WARN("Format 12 cmap table ... untested");
     cmap_obj = create_ToUnicode_cmap12(ttcmap->map,
 				       cmap_name, cmap_add, used_glyphs);
   } else {
-    ttcmap = tt_cmap_read(sfont, 3, 1);
+    ttcmap = tt_cmap_read(sfont, 3, 1); /* Microsoft UCS2 */
     if (ttcmap &&
 	ttcmap->format == 4) {
       cmap_obj = create_ToUnicode_cmap4(ttcmap->map,
 					cmap_name, cmap_add, used_glyphs);
     } else {
-      ERROR("Unable to read TrueType Unicode cmap table.");
+      ttcmap = tt_cmap_read(sfont, 0, 3); /* Unicode 2.0 or later */
+      if (ttcmap &&
+	  ttcmap->format == 4) {
+        cmap_obj = create_ToUnicode_cmap4(ttcmap->map,
+					  cmap_name, cmap_add, used_glyphs);
+      } else {
+        ERROR("Unable to read OpenType/TrueType Unicode cmap table.");
+      }
     }
   }
   tt_cmap_release(ttcmap);
@@ -1617,7 +1624,7 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon
 
   sfont = sfnt_open(fp);
   if (!sfont) {
-    ERROR("Could not open TrueType font file \"%s\"", map_name);
+    ERROR("Could not open OpenType/TrueType font file \"%s\"", map_name);
   }
   switch (sfont->type) {
   case SFNT_TYPE_TTC:
@@ -1631,12 +1638,12 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon
     offset = 0;
     break;
   default:
-    ERROR("Not a TrueType/TTC font?: %s", map_name);
+    ERROR("Not a OpenType/TrueType/TTC font?: %s", map_name);
     break;
   }
 
   if (sfnt_read_table_directory(sfont, offset) < 0)
-    ERROR("Could not read TrueType table directory.");
+    ERROR("Could not read OpenType/TrueType table directory.");
 
   base_name = NEW(strlen(map_name)+strlen("-UCS4-H")+5, char);
   if (wmode)
@@ -1693,18 +1700,21 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon
     return cmap_id;
   }
 
-  ttcmap = tt_cmap_read(sfont, 3, 10);
+  ttcmap = tt_cmap_read(sfont, 3, 10); /* Microsoft UCS4 */
   if (!ttcmap) {
-    ttcmap = tt_cmap_read(sfont, 3, 1);
-  }
-  if (!ttcmap) {
-    ERROR("Unable to read TrueType Unicode cmap table.");
+    ttcmap = tt_cmap_read(sfont, 3, 1); /* Microsoft UCS2 */
+    if (!ttcmap) {
+      ttcmap = tt_cmap_read(sfont, 0, 3); /* Unicode 2.0 or later */
+      if (!ttcmap) {
+        ERROR("Unable to read OpenType/TrueType Unicode cmap table.");
+      }
+    }
   }
   cmap_id = load_base_CMap(base_name, wmode,
 			   (is_cidfont ? &csi : NULL),
 			   GIDToCIDMap, ttcmap);
   if (cmap_id < 0)
-    ERROR("Failed to read TrueType cmap table.");
+    ERROR("Failed to read OpenType/TrueType cmap table.");
 
   if (!otl_tags) {
     RELEASE(cmap_name);
diff --git a/Build/source/texk/dvipdfmx/src/tt_glyf.c b/Build/source/texk/dvipdfmx/src/tt_glyf.c
index ad116edb8b0..c7c6d7041f0 100644
--- a/Build/source/texk/dvipdfmx/src/tt_glyf.c
+++ b/Build/source/texk/dvipdfmx/src/tt_glyf.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/tt_glyf.c,v 1.2 2005/06/09 14:31:11 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/tt_glyf.c,v 1.3 2007/02/14 05:56:43 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -243,7 +243,7 @@ tt_build_tables (sfnt *sfont, struct tt_glyphs *g)
   g->emsize = head->unitsPerEm;
 
   sfnt_locate_table(sfont, "hmtx");
-  hmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, hhea->numberOfHMetrics);
+  hmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, hhea->numOfLongHorMetrics, hhea->numOfExSideBearings);
 
   os2 = tt_read_os2__table(sfont);
   g->default_advh = os2->sTypoAscender - os2->sTypoDescender;
@@ -253,7 +253,7 @@ tt_build_tables (sfnt *sfont, struct tt_glyphs *g)
     struct tt_vhea_table *vhea;
     vhea = tt_read_vhea_table(sfont);
     sfnt_locate_table(sfont, "vmtx");
-    vmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, vhea->numOfLongVerMetrics);
+    vmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, vhea->numOfLongVerMetrics, vhea->numOfExSideBearings);
     RELEASE(vhea);
   } else {
     vmtx = NULL;
@@ -417,15 +417,15 @@ tt_build_tables (sfnt *sfont, struct tt_glyphs *g)
       padlen = (g->gd[i].length % 4) ? (4 - (g->gd[i].length % 4)) : 0;
       glyf_table_size += g->gd[i].length + padlen;
       if (!num_hm_known && last_advw != g->gd[i].advw) {
-	hhea->numberOfHMetrics = g->gd[i].gid + 2;
+	hhea->numOfLongHorMetrics = g->gd[i].gid + 2;
 	num_hm_known = 1;
       }
     }
     /* All advance widths are same. */
     if (!num_hm_known) {
-      hhea->numberOfHMetrics = 1;
+      hhea->numOfLongHorMetrics = 1;
     }
-    hmtx_table_size = hhea->numberOfHMetrics * 2 + (g->last_gid + 1) * 2;
+    hmtx_table_size = hhea->numOfLongHorMetrics * 2 + (g->last_gid + 1) * 2;
 
     /*
      * Choosing short format does not always give good result
@@ -448,9 +448,9 @@ tt_build_tables (sfnt *sfont, struct tt_glyphs *g)
       long gap, j;
       gap = (long) g->gd[i].gid - prev - 1;
       for (j = 1; j <= gap; j++) {
-	if (prev + j == hhea->numberOfHMetrics - 1) {
+	if (prev + j == hhea->numOfLongHorMetrics - 1) {
 	  p += sfnt_put_ushort(p, last_advw);
-	} else if (prev + j < hhea->numberOfHMetrics) {
+	} else if (prev + j < hhea->numOfLongHorMetrics) {
 	  p += sfnt_put_ushort(p, 0);
 	}
 	p += sfnt_put_short (p, 0);
@@ -461,7 +461,7 @@ tt_build_tables (sfnt *sfont, struct tt_glyphs *g)
 	}
       }
       padlen = (g->gd[i].length % 4) ? (4 - (g->gd[i].length % 4)) : 0;
-      if (g->gd[i].gid < hhea->numberOfHMetrics) {
+      if (g->gd[i].gid < hhea->numOfLongHorMetrics) {
 	p += sfnt_put_ushort(p, g->gd[i].advw);
       }
       p += sfnt_put_short (p, g->gd[i].lsb);
@@ -544,7 +544,7 @@ tt_get_metrics (sfnt *sfont, struct tt_glyphs *g)
   g->emsize = head->unitsPerEm;
 
   sfnt_locate_table(sfont, "hmtx");
-  hmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, hhea->numberOfHMetrics);
+  hmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, hhea->numOfLongHorMetrics, hhea->numOfExSideBearings);
 
   os2 = tt_read_os2__table(sfont);
   g->default_advh = os2->sTypoAscender - os2->sTypoDescender;
@@ -554,7 +554,7 @@ tt_get_metrics (sfnt *sfont, struct tt_glyphs *g)
     struct tt_vhea_table *vhea;
     vhea = tt_read_vhea_table(sfont);
     sfnt_locate_table(sfont, "vmtx");
-    vmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, vhea->numOfLongVerMetrics);
+    vmtx = tt_read_longMetrics(sfont, maxp->numGlyphs, vhea->numOfLongVerMetrics, vhea->numOfExSideBearings);
     RELEASE(vhea);
   } else {
     vmtx = NULL;
diff --git a/Build/source/texk/dvipdfmx/src/tt_table.c b/Build/source/texk/dvipdfmx/src/tt_table.c
index fde4d083e94..826cb036d58 100644
--- a/Build/source/texk/dvipdfmx/src/tt_table.c
+++ b/Build/source/texk/dvipdfmx/src/tt_table.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/tt_table.c,v 1.7 2004/09/11 14:50:29 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/tt_table.c,v 1.8 2007/02/14 05:56:43 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 /*
   tables contains information refered by other tables
   maxp->numGlyphs, etc --> loca, etc
-  hhea->numberOfHMetrics --> hmtx
+  hhea->numOfLongHorMetrics --> hmtx
   head->indexToLocFormat --> loca
   head->glyphDataFormat --> glyf
 */
@@ -162,20 +162,21 @@ char *tt_pack_hhea_table (struct tt_hhea_table *table)
 
   p  = data = NEW(TT_HHEA_TABLE_SIZE, char);
   p += sfnt_put_ulong(p, table->version);
-  p += sfnt_put_short(p, table->Ascender);
-  p += sfnt_put_short(p, table->Descender);
-  p += sfnt_put_short(p, table->LineGap);
+  p += sfnt_put_short(p, table->ascent);
+  p += sfnt_put_short(p, table->descent);
+  p += sfnt_put_short(p, table->lineGap);
   p += sfnt_put_ushort(p, table->advanceWidthMax);
   p += sfnt_put_short(p, table->minLeftSideBearing);
   p += sfnt_put_short(p, table->minRightSideBearing);
   p += sfnt_put_short(p, table->xMaxExtent);
   p += sfnt_put_short(p, table->caretSlopeRise);
   p += sfnt_put_short(p, table->caretSlopeRun);
-  for (i = 0; i < 5; i++) {
+  p += sfnt_put_short(p, table->caretOffset);
+  for (i = 0; i < 4; i++) {
     p += sfnt_put_short(p, table->reserved[i]);
   }
   p += sfnt_put_short(p, table->metricDataFormat);
-  p += sfnt_put_ushort(p, table->numberOfHMetrics);
+  p += sfnt_put_ushort(p, table->numOfLongHorMetrics);
 
   return data;
 }
@@ -184,28 +185,32 @@ struct tt_hhea_table *
 tt_read_hhea_table (sfnt *sfont)
 {
   int    i;
+  ULONG  len;
   struct tt_hhea_table *table = NULL;
 
+  len = sfnt_find_table_len(sfont, "hhea");
   sfnt_locate_table(sfont, "hhea");
 
   table = NEW(1, struct tt_hhea_table);
-  table->version   = sfnt_get_ulong(sfont);
-  table->Ascender  = sfnt_get_short (sfont);
-  table->Descender = sfnt_get_short(sfont);
-  table->LineGap   = sfnt_get_short(sfont);
+  table->version = sfnt_get_ulong(sfont);
+  table->ascent  = sfnt_get_short (sfont);
+  table->descent = sfnt_get_short(sfont);
+  table->lineGap = sfnt_get_short(sfont);
   table->advanceWidthMax     = sfnt_get_ushort(sfont);
   table->minLeftSideBearing  = sfnt_get_short(sfont);
   table->minRightSideBearing = sfnt_get_short(sfont);
   table->xMaxExtent     = sfnt_get_short(sfont);
   table->caretSlopeRise = sfnt_get_short(sfont);
   table->caretSlopeRun  = sfnt_get_short(sfont);
-  for(i = 0; i < 5; i++) {
+  table->caretOffset    = sfnt_get_short(sfont);
+  for(i = 0; i < 4; i++) {
     table->reserved[i] = sfnt_get_short(sfont);
   }
   table->metricDataFormat = sfnt_get_short(sfont);
   if (table->metricDataFormat != 0)
     ERROR("unknown metricDaraFormat");
-  table->numberOfHMetrics = sfnt_get_ushort(sfont);
+  table->numOfLongHorMetrics = sfnt_get_ushort(sfont);
+  table->numOfExSideBearings = (USHORT)((len - table->numOfLongHorMetrics * 4) / 2);
 
   return table;
 }
@@ -229,9 +234,10 @@ tt_pack_vhea_table (struct tt_vhea_table *table)
   p += sfnt_put_short(p, table->caretSlopeRise);
   p += sfnt_put_short(p, table->caretSlopeRun);
   p += sfnt_put_short(p, table->caretOffset);
-  for(i = 0; i < 5; i++) {
+  for(i = 0; i < 4; i++) {
     p += sfnt_put_short(p, table->reserved[i]);
   }
+  p += sfnt_put_short(p, table->metricDataFormat);
   p += sfnt_put_ushort(p, table->numOfLongVerMetrics);
 
   return data;
@@ -239,9 +245,11 @@ tt_pack_vhea_table (struct tt_vhea_table *table)
 
 struct tt_vhea_table *tt_read_vhea_table (sfnt *sfont)
 {
-  int i;
+  int   i;
+  ULONG len;
   struct tt_vhea_table *table = NULL;
 
+  len = sfnt_find_table_len(sfont, "vhea");
   sfnt_locate_table(sfont, "vhea");
 
   table = NEW(1, struct tt_vhea_table);
@@ -256,10 +264,12 @@ struct tt_vhea_table *tt_read_vhea_table (sfnt *sfont)
   table->caretSlopeRise = sfnt_get_short(sfont);
   table->caretSlopeRun = sfnt_get_short(sfont);
   table->caretOffset = sfnt_get_short(sfont);
-  for(i=0;i<5;i++) {
+  for(i = 0; i < 4; i++) {
     (table->reserved)[i] = sfnt_get_short(sfont);
   }
+  table->metricDataFormat = sfnt_get_short(sfont);
   table->numOfLongVerMetrics = sfnt_get_ushort(sfont);
+  table->numOfExSideBearings = (USHORT)((len - table->numOfLongVerMetrics * 4) / 2);
 
   return table;
 }
@@ -309,17 +319,20 @@ tt_read_VORG_table (sfnt *sfont)
  */
 
 struct tt_longMetrics *
-tt_read_longMetrics (sfnt *sfont, USHORT numGlyphs, USHORT numLongMetrics)
+tt_read_longMetrics (sfnt *sfont, USHORT numGlyphs, USHORT numLongMetrics, USHORT numExSideBearings)
 {
   struct tt_longMetrics *m;
   USHORT gid, last_adv = 0;
+  SHORT  last_esb = 0;
 
   m = NEW(numGlyphs, struct tt_longMetrics);
   for (gid = 0; gid < numGlyphs; gid++) {
     if (gid < numLongMetrics)
       last_adv = sfnt_get_ushort(sfont);
-    m[gid].sideBearing = sfnt_get_short(sfont);
+    if (gid < numLongMetrics + numExSideBearings)
+      last_esb = sfnt_get_short(sfont);
     m[gid].advance     = last_adv;
+    m[gid].sideBearing = last_esb;
   }
 
   return m;
diff --git a/Build/source/texk/dvipdfmx/src/tt_table.h b/Build/source/texk/dvipdfmx/src/tt_table.h
index 172ec04f542..bba65d923ee 100644
--- a/Build/source/texk/dvipdfmx/src/tt_table.h
+++ b/Build/source/texk/dvipdfmx/src/tt_table.h
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/tt_table.h,v 1.6 2004/09/11 14:50:29 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/tt_table.h,v 1.7 2007/02/14 05:56:43 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     This program is free software; you can redistribute it and/or modify
@@ -51,18 +51,20 @@ struct tt_head_table
 struct tt_hhea_table
 {
   Fixed  version;
-  FWord  Ascender;
-  FWord  Descender;
-  FWord  LineGap;
+  FWord  ascent;
+  FWord  descent;
+  FWord  lineGap;
   uFWord advanceWidthMax;
   FWord  minLeftSideBearing;
   FWord  minRightSideBearing;
   FWord  xMaxExtent;
   SHORT  caretSlopeRise;
   SHORT  caretSlopeRun;
-  SHORT  reserved[5]; /* set to 0 */
+  FWord  caretOffset;
+  SHORT  reserved[4]; /* set to 0 */
   SHORT  metricDataFormat;
-  USHORT numberOfHMetrics;
+  USHORT numOfLongHorMetrics;
+  USHORT numOfExSideBearings; /* extra information */
 };
 
 struct tt_vhea_table
@@ -78,8 +80,10 @@ struct tt_vhea_table
   SHORT  caretSlopeRise;
   SHORT  caretSlopeRun;
   SHORT  caretOffset;
-  SHORT  reserved[5]; /* set to 0 */
+  SHORT  reserved[4]; /* set to 0 */
+  SHORT  metricDataFormat;
   USHORT numOfLongVerMetrics;
+  USHORT numOfExSideBearings; /* extra information */
 };
 
 struct tt_maxp_table
@@ -179,7 +183,7 @@ extern struct tt_VORG_table *tt_read_VORG_table (sfnt *sfont);
 
 /* hmtx and vmtx */
 extern struct tt_longMetrics *tt_read_longMetrics (sfnt *sfont,
-						   USHORT numGlyphs, USHORT numLongMetrics);
+						   USHORT numGlyphs, USHORT numLongMetrics, USHORT numExSideBearings);
 
 /* OS/2 table */
 extern struct tt_os2__table *tt_read_os2__table (sfnt *sfont);
diff --git a/Build/source/texk/dvipdfmx/src/type1.c b/Build/source/texk/dvipdfmx/src/type1.c
index e896508210e..859af73f873 100644
--- a/Build/source/texk/dvipdfmx/src/type1.c
+++ b/Build/source/texk/dvipdfmx/src/type1.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/type1.c,v 1.38 2005/07/17 09:53:38 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/type1.c,v 1.40 2007/11/14 03:12:21 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
 
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -268,7 +268,7 @@ get_font_attr (pdf_font *font, cff_font *cffont)
 }
 
 static void
-add_metrics (pdf_font *font, cff_font *cffont, double *widths, long num_glyphs)
+add_metrics (pdf_font *font, cff_font *cffont, char **enc_vec, double *widths, long num_glyphs)
 {
   pdf_obj *fontdict, *descriptor;
   pdf_obj *tmp_array;
@@ -321,7 +321,7 @@ add_metrics (pdf_font *font, cff_font *cffont, double *widths, long num_glyphs)
     }
     for (code = firstchar; code <= lastchar; code++) {
       if (usedchars[code]) {
-	gid = cff_encoding_lookup(cffont, code);
+	gid = cff_glyph_lookup(cffont, enc_vec[code]);
 	pdf_add_array(tmp_array,
 		      pdf_new_number(ROUND(widths[gid], 1.0)));
       } else {
@@ -414,6 +414,9 @@ write_fontfile (pdf_font *font, cff_font *cffont, long num_glyphs)
   offset += cff_pack_index(cffont->gsubr,
 			   stream_data_ptr + offset, stream_data_len - offset);
   /* Encoding */
+  /* TODO: don't write Encoding entry if the font is always used
+   * with PDF Encoding information. Applies to type1c.c as well.
+   */
   cff_dict_set(cffont->topdict, "Encoding", 0, offset);
   offset += cff_pack_encoding(cffont,
 			      stream_data_ptr + offset, stream_data_len - offset);
@@ -488,15 +491,6 @@ pdf_font_load_type1 (pdf_font *font)
   encoding_id = pdf_font_get_encoding  (font);
   fontdict    = pdf_font_get_resource  (font);
 
-  if (pdf_font_get_flag(font, PDF_FONT_FLAG_BASEFONT)) {
-    if (encoding_id >= 0) {
-      pdf_add_dict(fontdict,
-		   pdf_new_name("Encoding"),
-		   pdf_get_encoding_reference(encoding_id));
-    }
-    return 0;
-  }
-
   descriptor  = pdf_font_get_descriptor(font);
   usedchars   = pdf_font_get_usedchars (font);
   ident       = pdf_font_get_ident     (font);
@@ -536,22 +530,6 @@ pdf_font_load_type1 (pdf_font *font)
    * Encoding related things.
    */
   if (encoding_id >= 0) {
-    if (pdf_encoding_is_predefined(encoding_id)) {
-      pdf_add_dict(fontdict,
-		   pdf_new_name("Encoding"),
-		   pdf_new_name(pdf_encoding_get_name(encoding_id)));
-    } else {
-#if 0
-      /*
-       * Gs not working with this.
-       */
-      pdf_add_dict(fontdict,
-		   pdf_new_name("Encoding"),
-		   pdf_get_encoding_resource(enc));
-#endif
-      if (!pdf_lookup_dict(fontdict, "ToUnicode"))
-      pdf_attach_ToUnicode_CMap(fontdict, encoding_id, usedchars);
-    }
     enc_vec = pdf_encoding_get_encoding(encoding_id);
   } else {
     pdf_obj *tounicode;
@@ -781,7 +759,7 @@ pdf_font_load_type1 (pdf_font *font)
   if (verbose > 2)
     MESG("]");
 
-  add_metrics(font, cffont, widths, num_glyphs);
+  add_metrics(font, cffont, enc_vec, widths, num_glyphs);
 
   offset = write_fontfile(font, cffont, num_glyphs);
   if (verbose > 1)
diff --git a/Build/source/texk/dvipdfmx/src/type1c.c b/Build/source/texk/dvipdfmx/src/type1c.c
index 836a4c4e06d..be2525da446 100644
--- a/Build/source/texk/dvipdfmx/src/type1c.c
+++ b/Build/source/texk/dvipdfmx/src/type1c.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/type1c.c,v 1.21 2005/07/17 09:53:38 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/type1c.c,v 1.22 2007/11/14 03:12:21 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
 
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -304,22 +304,6 @@ pdf_font_load_type1c (pdf_font *font)
    */
   enc_vec = NULL;
   if (encoding_id >= 0) {
-    if (pdf_encoding_is_predefined(encoding_id)) {
-      pdf_add_dict(fontdict,
-		   pdf_new_name("Encoding"),
-		   pdf_new_name(pdf_encoding_get_name(encoding_id)));
-    } else {
-#if 0
-      /*
-       * Gs not working with this.
-       */
-      pdf_add_dict(fontdict,
-		   pdf_new_name("Encoding"),
-		   pdf_get_encoding_reference(encoding_id));
-#endif
-      if (!pdf_lookup_dict(fontdict, "ToUnicode"))
-      pdf_attach_ToUnicode_CMap(fontdict, encoding_id, usedchars);
-    }
     enc_vec = pdf_encoding_get_encoding(encoding_id);
   } else {
     pdf_obj *tounicode;
@@ -340,16 +324,16 @@ pdf_font_load_type1c (pdf_font *font)
       }
     }
     if (!pdf_lookup_dict(fontdict, "ToUnicode")) {
-    tounicode = pdf_create_ToUnicode_CMap(fullname,
-					  enc_vec, usedchars);
-    if (tounicode) {
-      pdf_add_dict(fontdict,
+      tounicode = pdf_create_ToUnicode_CMap(fullname,
+					    enc_vec, usedchars);
+      if (tounicode) {
+	pdf_add_dict(fontdict,
                      pdf_new_name("ToUnicode"),
                      pdf_ref_obj (tounicode));
-      pdf_release_obj(tounicode);
+	pdf_release_obj(tounicode);
+      }
     }
   }
-  }
 
   /*
    * New Encoding data:
diff --git a/Build/source/texk/dvipdfmx/src/vf.c b/Build/source/texk/dvipdfmx/src/vf.c
index 589c5907767..c682398593d 100644
--- a/Build/source/texk/dvipdfmx/src/vf.c
+++ b/Build/source/texk/dvipdfmx/src/vf.c
@@ -1,8 +1,8 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/vf.c,v 1.16 2005/07/20 10:41:54 hirata Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/vf.c,v 1.18 2007/11/14 03:36:01 chofchof Exp $
     
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
@@ -768,7 +768,8 @@ static void vf_xxx (SIGNED_QUAD len, unsigned char **start, unsigned char *end)
        * Warning message from virtual font.
        */
       if (!memcmp((char *)p, "Warning:", 8)) {
-	WARN("VF:%s", p+8);
+        if (verbose)
+	  WARN("VF:%s", p+8);
       } else {
 	dvi_do_special(buffer, len);
       }
@@ -1011,9 +1012,6 @@ void vf_close_all_fonts(void)
   unsigned long i;
   int j;
   struct font_def *one_font;
-#ifdef MEM_DEBUG
-MEM_START
-#endif
   for (i=0; i<num_vf_fonts; i++) {
     /* Release the packet for each character */
     if (vf_fonts[i].ch_pkt) {
@@ -1038,8 +1036,5 @@ MEM_START
   }
   if (vf_fonts != NULL)
     RELEASE (vf_fonts);
-#ifdef MEM_DEBUG
-MEM_END
-#endif
   return;
 }
diff --git a/Build/source/texk/dvipdfmx/src/xbb.c b/Build/source/texk/dvipdfmx/src/xbb.c
new file mode 100644
index 00000000000..4f1b17e825d
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/src/xbb.c
@@ -0,0 +1,564 @@
+/*  $Header: /home/cvsroot/dvipdfmx/src/xbb.c,v 1.3 2007/11/14 03:36:01 chofchof Exp $
+
+    This is xbb, a bounding box extraction program extending ebb.
+
+    Copyright (C) 2007 by Jin-Hwan Cho <chofchof@ktug.or.kr>
+
+    Copyright (C) 1998, 1999 by Mark A. Wicks
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include "system.h"
+#include "mem.h"
+#include "mfileio.h"
+#include "numbers.h"
+#include "pdfobj.h"
+#include "pdfparse.h"
+
+#include "config.h"
+
+#ifdef HAVE_LIBPNG
+#include <png.h>
+#endif
+
+#define XBB_PROGRAM "xbb"
+#define XBB_VERSION "Version 0.1"
+
+static void usage (void)
+{
+  fprintf (stderr, "%s, version %s, Copyright (C) 2007 by Jin-Hwan Cho\n",
+	   XBB_PROGRAM, XBB_VERSION);
+  fprintf (stderr, "xbb is an extension of ebb developed by Mark A. Wicks.\n");
+  fprintf (stderr, "This is free software, and you are welcome to redistribute it\n");
+  fprintf (stderr, "under certain conditions.  Details are distributed with the software.\n");
+  fprintf (stderr, "\nUsage: xbb [-v] [-b] [files]\n");
+  fprintf (stderr, "\t-b\t\tWrite .xbb file in binary mode\n");
+  fprintf (stderr, "\t-v\t\tVerbose\n");
+  exit(1);
+}
+
+static char verbose = 0;
+
+static void do_time(FILE *file)
+{
+  time_t current_time;
+  struct tm *bd_time;
+  time(&current_time);
+  bd_time = localtime(&current_time);
+  fprintf (file, "%%%%CreationDate: %s\n", asctime (bd_time));
+}
+
+char *extensions[] = {
+  ".jpeg", ".JPEG", ".jpg", ".JPG", ".pdf", ".PDF", ".png", ".PNG"
+};
+
+static char *make_xbb_filename (const char *name)
+{
+  int i;
+  char *result;
+  name = xbasename (name);
+  for (i=0; i<sizeof(extensions)/sizeof(extensions[0]); i++) {
+    if (strlen (extensions[i]) < strlen(name) &&
+	!strncmp (name+strlen(name)-strlen(extensions[i]),
+		  extensions[i], strlen(extensions[i])))
+      break;
+  }
+  if (i == sizeof(extensions)/sizeof(extensions[0])) {
+    fprintf (stderr,
+	     "xbb: Warning: %s: Filename does not end in a recognizeable extension.\n",
+	     name);
+    result = NEW (strlen(name)+3, char);
+    strcpy (result, name);
+  }
+  else { /* Remove extension */
+    result = NEW (strlen(name)+3-strlen(extensions[i])+1, char);
+    strncpy (result, name, strlen(name)-strlen(extensions[i]));
+    result[strlen(name)-strlen(extensions[i])] = 0;
+  }
+    strcat (result, ".xbb");
+  return result;
+}
+
+static char *xbb_file_mode = FOPEN_W_MODE;
+
+static void write_xbb (char *filename, int bbllx, int bblly, int bburx,
+		      int bbury) 
+{
+  char *xbbfilename;
+  FILE *xbbfile;
+  if (verbose)
+    fprintf (stderr, "okay\n");
+  xbbfilename = make_xbb_filename (filename);
+  if ((xbbfile = MFOPEN (xbbfilename, xbb_file_mode)) == NULL) {
+    fprintf (stderr, "Unable to open output file: %s\n", xbbfilename);
+    return;
+  }
+  if (verbose) {
+    fprintf (stderr, "Writing to %s:  ", xbbfilename);
+    fprintf (stderr, "Bounding box:  %d %d %d %d\n", bbllx, bblly,
+	     bburx, bbury);
+  }
+  fprintf (xbbfile, "%%%%Title: %s\n", filename);
+  fprintf (xbbfile, "%%%%Creator: %s %s\n", XBB_PROGRAM, XBB_VERSION);
+  fprintf (xbbfile, "%%%%BoundingBox: %d %d %d %d\n",
+	   bbllx, bblly, bburx, bbury);
+  do_time(xbbfile);
+  RELEASE (xbbfilename);
+  MFCLOSE (xbbfile);
+  return;
+}
+
+/* JPEG Markers */
+typedef enum {
+  JM_SOF0  = 0xc0,
+  JM_SOF1  = 0xc1,
+  JM_SOF2  = 0xc2,
+  JM_SOF3  = 0xc3,
+  JM_SOF5  = 0xc5,
+  JM_DHT   = 0xc4,
+  JM_SOF6  = 0xc6,
+  JM_SOF7  = 0xc7,
+  JM_SOF9  = 0xc9,
+  JM_SOF10 = 0xca,
+  JM_SOF11 = 0xcb,
+  JM_DAC   = 0xcc,
+  JM_SOF13 = 0xcd,
+  JM_SOF14 = 0xce,
+  JM_SOF15 = 0xcf,
+
+  JM_RST0  = 0xd0,
+  JM_RST1  = 0xd1,
+  JM_RST2  = 0xd2,
+  JM_RST3  = 0xd3,
+  JM_RST4  = 0xd4,
+  JM_RST5  = 0xd5,
+  JM_RST6  = 0xd6,
+  JM_RST7  = 0xd7,
+
+  JM_SOI   = 0xd8,
+  JM_EOI   = 0xd9,
+  JM_SOS   = 0xda,
+  JM_DQT   = 0xdb,
+  JM_DNL   = 0xdc,
+  JM_DRI   = 0xdd,
+  JM_DHP   = 0xde,
+  JM_EXP   = 0xdf,
+
+  JM_APP0  = 0xe0,
+  JM_APP2  = 0xe2,
+  JM_APP14 = 0xee,
+  JM_APP15 = 0xef,
+
+  JM_COM   = 0xfe
+} JPEG_marker;
+
+static JPEG_marker JPEG_get_marker (FILE *fp)
+{
+  int c = fgetc(fp);
+  if (c != 255) return -1;
+  for (;;) {
+    c = fgetc(fp);
+    if (c < 0) return -1;
+    else if (c > 0 && c < 255) return c;
+  }
+  return -1;
+}
+
+static int check_for_jpeg (FILE *fp)
+{
+  unsigned char jpeg_sig[2];
+  rewind(fp);
+  if (fread(jpeg_sig, sizeof(unsigned char), 2, fp) != 2) return 0;
+  else if (jpeg_sig[0] != 0xff || jpeg_sig[1] != JM_SOI) return 0;
+  return 1;
+} 
+
+static int jpeg_get_info (FILE *fp, int *width, int *height)
+{
+  JPEG_marker marker;
+  unsigned short length;
+  int  count;
+  float xdensity = 1.0, ydensity = 1.0;
+  char app_sig[128];
+      
+  if (!check_for_jpeg(fp)) {
+    rewind(fp);
+    return -1;
+  } 
+  rewind(fp);
+  count = 0;
+  while ((marker = JPEG_get_marker(fp)) >= 0) {
+    if (marker == JM_SOI  || (marker >= JM_RST0 && marker <= JM_RST7)) {
+      count++; continue;
+    }
+    length = get_unsigned_pair(fp) - 2;
+    switch (marker) {
+    case JM_SOF0:  case JM_SOF1:  case JM_SOF2:  case JM_SOF3:
+    case JM_SOF5:  case JM_SOF6:  case JM_SOF7:  case JM_SOF9:
+    case JM_SOF10: case JM_SOF11: case JM_SOF13: case JM_SOF14:
+    case JM_SOF15:
+      get_unsigned_byte(fp);
+      *height = (int)(get_unsigned_pair(fp) * ydensity + 0.5);
+      *width  = (int)(get_unsigned_pair(fp) * xdensity + 0.5);
+      return 0;
+    case JM_APP0:
+      if (length > 5) {
+	if (fread(app_sig, sizeof(char), 5, fp) != 5) return -1;
+	length -= 5;
+	if (!memcmp(app_sig, "JFIF\000", 5)) {
+          int units, xden, yden;
+          get_unsigned_pair(fp);
+          units = (int)get_unsigned_byte(fp);
+          xden = (int)get_unsigned_pair(fp);
+          yden = (int)get_unsigned_pair(fp);
+          fprintf(stderr, "%d:%d:%d\n", units, xden, yden);
+          switch (units) {
+          case 1: /* pixels per inch */
+            xdensity = 72.0 / xden;
+            ydensity = 72.0 / yden;
+            break;
+          case 2: /* pixels per centimeter */
+            xdensity = 72.0 / 2.54 / xden;
+            ydensity = 72.0 / 2.54 / yden;
+            break;
+          default:
+            break;
+          }
+          length -= 7;
+	}
+      }
+      seek_relative(fp, length);
+      break;
+    default:
+      seek_relative(fp, length);
+      break;
+    }
+    count++;
+  }
+  return -1; 
+}
+
+static void do_jpeg (FILE *fp, char *filename)
+{
+  int width, height;
+
+  if (jpeg_get_info(fp, &width, &height) < 0) {
+    fprintf (stderr, "%s does not look like a JPEG file...\n", filename);
+    return;
+  }
+  write_xbb(filename, 0, 0, width, height);
+  return;
+}
+
+#ifdef HAVE_LIBPNG
+static int check_for_png (FILE *png_file) 
+{
+  unsigned char sigbytes[4];
+  rewind (png_file);
+  if (fread(sigbytes, 1, sizeof(sigbytes), png_file) != sizeof(sigbytes) ||
+      (!png_check_sig (sigbytes, sizeof(sigbytes)))) return 0;
+  else return 1;
+}             
+
+static int png_get_info (FILE *png_file, int *width, int *height)
+{
+  png_structp png_ptr;
+  png_infop   png_info_ptr;
+  png_uint_32 xppm, yppm;
+
+  rewind (png_file);
+  png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+  if (png_ptr == NULL || (png_info_ptr = png_create_info_struct (png_ptr)) == NULL) {
+    if (png_ptr) png_destroy_read_struct(&png_ptr, NULL, NULL);
+    return -1;
+  }
+  png_init_io (png_ptr, png_file);
+  png_read_info(png_ptr, png_info_ptr);
+  *width  = (int)png_get_image_width (png_ptr, png_info_ptr);
+  *height = (int)png_get_image_height(png_ptr, png_info_ptr);
+  xppm = png_get_x_pixels_per_meter(png_ptr, png_info_ptr);
+  yppm = png_get_y_pixels_per_meter(png_ptr, png_info_ptr);
+  if (xppm > 0)
+    *width = (int)(*width * 72.0 / 0.0254 / xppm + 0.5);
+  if (yppm > 0)
+    *height = (int)(*height * 72.0 / 0.0254 / yppm + 0.5);
+  return 0;
+}
+
+static void do_png (FILE *fp, char *filename)
+{
+  int width, height;
+
+  if (png_get_info(fp, &width, &height) < 0) {
+    fprintf (stderr, "%s does not look like a PNG file...\n", filename);
+    return;
+  }
+  write_xbb(filename, 0, 0, width, height);
+  return;
+}
+#endif /* HAVE_LIBPNG */
+
+static int rect_equal (pdf_obj *rect1, pdf_obj *rect2)
+{
+  int i;
+  if (!rect1 || !rect2) return 0;
+  for (i = 0; i < 4; i++) {
+    if (pdf_number_value(pdf_get_array(rect1, i)) != pdf_number_value(pdf_get_array(rect2, i))) return 0;
+  }
+  return 1;
+}
+
+static int pdf_get_info (FILE *image_file, int *llx, int *lly, int *urx, int *ury)
+{
+  pdf_obj *page_tree;
+  pdf_obj *bbox;
+
+  page_tree = NULL;
+  {
+    pdf_obj *trailer, *catalog, *tmp;
+
+    trailer = pdf_open(image_file);
+    if (!trailer) {
+      WARN("Trailer not found! Corrupt PDF file?");
+      pdf_close();
+      return -1;
+    }
+    if (pdf_lookup_dict(trailer, "Encrypt")) {
+      WARN("This PDF document is encrypted.");
+      pdf_release_obj(trailer);
+      pdf_close();
+      return -1;
+    }
+    catalog = pdf_deref_obj(pdf_lookup_dict(trailer, "Root"));
+    if (!catalog) {
+      WARN("Catalog isn't where I expect it.");
+      pdf_close();
+      return -1;
+    }
+    pdf_release_obj(trailer);
+    page_tree = pdf_deref_obj(pdf_lookup_dict(catalog, "Pages"));
+    pdf_release_obj(catalog);
+  }
+  if (!page_tree) {
+    WARN("Page tree not found.");
+    pdf_close();
+    return -1;
+  }
+  {
+    pdf_obj *kids_ref, *kids;
+    pdf_obj *crop_box;
+    pdf_obj *tmp;
+
+    tmp  = pdf_lookup_dict(page_tree, "MediaBox");
+    bbox = tmp ? pdf_deref_obj(tmp) : NULL;
+    tmp  = pdf_lookup_dict(page_tree, "CropBox");
+    crop_box = tmp ? pdf_deref_obj(tmp) : NULL;
+
+    while ((kids_ref = pdf_lookup_dict(page_tree, "Kids")) != NULL) {
+      kids = pdf_deref_obj(kids_ref);
+      pdf_release_obj(page_tree);
+      page_tree = pdf_deref_obj(pdf_get_array(kids, 0));
+      pdf_release_obj(kids);
+
+      if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "MediaBox")))) {
+	if (bbox)
+	  pdf_release_obj(bbox);
+	bbox = tmp;
+      }
+      if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "BleedBox")))) {
+        if (!rect_equal(tmp, bbox)) {
+	  if (bbox)
+	    pdf_release_obj(bbox);
+	  bbox = tmp;
+        }
+      }
+      if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "TrimBox")))) {
+        if (!rect_equal(tmp, bbox)) {
+	  if (bbox)
+	    pdf_release_obj(bbox);
+	  bbox = tmp;
+        }
+      }
+      if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "ArtBox")))) {
+        if (!rect_equal(tmp, bbox)) {
+	  if (bbox)
+	    pdf_release_obj(bbox);
+	  bbox = tmp;
+        }
+      }
+      if ((tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "CropBox")))) {
+	if (crop_box)
+	  pdf_release_obj(crop_box);
+	crop_box = tmp;
+      }
+    }
+    if (crop_box) {
+      pdf_release_obj(bbox);
+      bbox = crop_box;
+    }
+  }
+
+  if (!bbox) {
+    WARN("No BoundingBox information available.");
+    pdf_release_obj(page_tree);
+    pdf_close();
+    return -1;
+  }
+
+  *llx = (int)pdf_number_value(pdf_get_array(bbox, 0));
+  *lly = (int)pdf_number_value(pdf_get_array(bbox, 1));
+  *urx = (int)pdf_number_value(pdf_get_array(bbox, 2));
+  *ury = (int)pdf_number_value(pdf_get_array(bbox, 3));
+
+  pdf_close();
+  return 0;
+}
+
+static void do_pdf (FILE *fp, char *filename)
+{
+  int llx, lly, urx, ury;
+
+  if (pdf_get_info(fp, &llx, &lly, &urx, &ury) < 0) {
+    fprintf (stderr, "%s does not look like a PDF file...\n", filename);
+    return;
+  }
+  write_xbb(filename, llx, lly, urx, ury);
+  return;
+}
+
+FILE *inputfile;
+
+int main (int argc, char *argv[]) 
+{
+  mem_debug_init();
+
+  pdf_set_version(5);
+  kpse_set_program_name (argv[0], NULL);
+  argc -= 1;
+  argv += 1;
+  if (argc == 0)
+    usage();
+  while (argc > 0 && *argv[0] == '-') {
+    switch (*(argv[0]+1)) {
+    case 'b':
+      xbb_file_mode = FOPEN_WBIN_MODE;
+    case 'v':
+      verbose = 1;
+      argc -= 1;
+      argv += 1;
+      break;
+    case 'h':  
+      usage();
+      argc -= 1;
+      argv += 1;
+      break;
+    default:
+      usage();
+    }
+  }
+  for (; argc > 0; argc--, argv++) {
+    char *kpse_file_name;
+    if (!(kpse_file_name = kpse_find_pict(argv[0])) ||
+        (inputfile = MFOPEN (kpse_file_name, FOPEN_RBIN_MODE)) == NULL)  {
+      fprintf (stderr, "Can't find file (%s)...skipping\n", argv[0]);
+      continue;
+    }
+    if (check_for_jpeg(inputfile)) {
+      do_jpeg(inputfile, kpse_file_name);
+      MFCLOSE(inputfile);
+      continue;
+    }
+    if (check_for_pdf(inputfile)) {
+      do_pdf(inputfile, kpse_file_name);
+      MFCLOSE(inputfile);
+      continue;
+    }
+#ifdef HAVE_LIBPNG
+    if (check_for_png(inputfile)) {
+      do_png(inputfile, kpse_file_name);
+      MFCLOSE(inputfile);
+      continue;
+    }
+#endif /* HAVE_LIBPNG */
+    fprintf (stderr, "Can't handle file type for file named %s\n",
+	     argv[0]);
+  }
+  mem_debug_check();
+
+  return 0;
+}
+
+/* The following is here to prevent a link error.  Other routines
+   that get linked with xbb call this, but it isn't actually needed
+   for xbb  */
+
+pdf_obj *get_reference (char **start, char *end)
+{
+  fprintf (stderr, "get_reference():  This should never have been called\n");
+  return NULL;
+}
+
+void error_cleanup(void)
+{
+  /* For now, this is a do nothing routine, but the stub is required
+     by error.h */
+  return;
+}
+
+static int p_dtoa (double value, int prec, char *buf)
+{
+  int    n;
+  char  *p, *q;
+  n = sprintf(buf, "%.*f", prec, value);
+  for (p = buf + n - 1; p > buf && *p != '.'; p--);
+  if (p > buf) {
+    for (q = buf + n - 1; q > p && *q == '0'; q--) { *q = '\0'; n--; }
+    if (q == p) { *q = '\0'; n--; }
+  }
+  if (n == 2 && buf[0] == '-' && buf[1] == '0') {
+    buf[0] = '0'; buf[1] = '\0'; n = 1;
+  }
+  return  n;
+}
+
+int pdf_sprint_number (char *buf, double value)
+{ 
+  int  len = p_dtoa(value, 8, buf);
+  buf[len] = '\0';
+  return len;
+}
+
+pdf_obj *spc_lookup_reference (const char *key)
+{
+  return NULL;
+}
+
+void pdf_enc_set_generation (unsigned generation)
+{
+  return;
+}
+
+void pdf_enc_set_label (unsigned long label)
+{
+  return;
+}
+
+void pdf_encrypt_data (unsigned char *data, unsigned long len)
+{
+  return;
+}
author	Karl Berry <karl@freefriends.org>	2008-04-21 00:43:12 +0000
committer	Karl Berry <karl@freefriends.org>	2008-04-21 00:43:12 +0000
commit	522864734c14c14e4271f25fc2930a0a98285f71 (patch)
tree	aed654dbf1ae6e72828140d796cf6d3556c439f9 /Build
parent	c45aea54ea6e47ebd46f0a0025acfd0b9b2b9311 (diff)