Update to fonttosfnt version 1.0.4.

13 files changed, 974 insertions, 155 deletions

diff --git a/app/fonttosfnt/COPYING b/app/fonttosfnt/COPYING
index 7f33cbfd2..b706b38c8 100644
--- a/app/fonttosfnt/COPYING
+++ b/app/fonttosfnt/COPYING
@@ -1,12 +1,19 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2002-2008 by Juliusz Chroboczek
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/app/fonttosfnt/ChangeLog b/app/fonttosfnt/ChangeLog
index de4d8b248..46c6c3b1f 100644
--- a/app/fonttosfnt/ChangeLog
+++ b/app/fonttosfnt/ChangeLog
@@ -1,3 +1,108 @@
+commit a9a8778a984e69007d77227969b0103b2a81e4c8
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun May 11 00:50:20 2008 +0200
+
+    Bump to 1.0.4
+
+commit b3046750c37837dfe6d2a488361a1c78abdce138
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Sun May 11 00:46:52 2008 +0200
+
+    Use va_copy in vsprintf_alloc.
+    This avoids a crash on arches with an interesting implementation of va_list
+    (such as AMD64) but no vasprintf in their libc.
+
+commit a0d110f283e387e9c594d422c5c75cb593def91e
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun May 11 00:45:51 2008 +0200
+
+    Add autoconf test for va_copy.
+
+commit e583311c8a73a675fc3396fe24cdafcad53e60e5
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun May 11 00:32:05 2008 +0200
+
+    Use autoconf test instead of #ifdef GLIBC for vasprintf.
+
+commit 8e36cc8647b27a4d14cf3f63045410db79fb98a3
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Sun May 11 00:30:12 2008 +0200
+
+    Rename *_reliable to *_alloc.
+
+commit 867c33d332abe479ab088f98e01c06800203a3e0
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Sun May 11 00:01:38 2008 +0200
+
+    Update copyright date.
+
+commit 4ecd697abe1026eb27e1373bf357ebca2ade4138
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Fri May 2 19:24:21 2008 +0200
+
+    Use asprintf on GNU platforms.
+    This fixes fonttosfnt on AMD64 with glibc.  It will still break on
+    non-GNU RISC platforms, because I'm incompetent and cannot use va_copy.
+
+commit 5cb6dcac85b89deea8263e1b7bcb7714e07063ff
+Author: George Williams <gww@silcom.com>
+Date:   Fri May 2 19:14:58 2008 +0200
+
+    Fix handling for non-square pixels.
+
+commit 95a16fb0001abcea6a12b4eb2e1a1d24ab83d5fa
+Author: George Williams <gww@silcom.com>
+Date:   Fri May 2 19:09:09 2008 +0200
+
+    Fix off-by-one entrySel field.
+
+commit bbab34919743990bf87935480092f7644f8f02fc
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Mar 13 13:19:11 2008 -0400
+
+    I’m not sure the PCLT table is needed by the fonts generated here, but
+    use a fixed 16 char string as the initializer for the PCLT Fontname field
+    to silence the warning (or error for some compilers) as reported in bugzilla:
+    
+    http://bugs.freedesktop.org/show_bug.cgi?id=3928
+
+commit 5bf16aed7ba59559a636552811f7267d79a746bb
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:51:00 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 64474e003376039cf485fa6eb41d241170397ab4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Aug 10 16:21:44 2007 -0700
+
+    Change fonttosfnt_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+commit 0c316fb4aadf26bea5784974cd484483d6322b5c
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat Dec 16 01:37:31 2006 +0200
+
+    bump to 1.0.3
+
+commit 0eba2afb80bf17c0a2d2753ff92c1986211d92be
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Dec 6 19:01:27 2006 +0200
+
+    Makefile.am: make ChangeLog hook safer
+    Make ChangeLog hook as safe as possible.
+
+commit 8c2de974ec3df06a547906474ced5ffb4a07a6b5
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date:   Tue Oct 31 01:48:49 2006 +0100
+
+    Fix author address in manual page, update COPYING.
+
+commit e734cef9baff470a5e913f2e9ac7e0ce649ea7dc
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date:   Fri Oct 13 17:30:24 2006 -0400
+
+    Bump to 1.0.2
+
 commit 72caf26ad336b3de9af3e640f939ea2cd0caa42b
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Thu Oct 12 20:56:01 2006 -0400
diff --git a/app/fonttosfnt/Makefile.am b/app/fonttosfnt/Makefile.am
index b1d6a132e..3fe03dfa8 100644
--- a/app/fonttosfnt/Makefile.am
+++ b/app/fonttosfnt/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = fonttosfnt
 
-fonttosfnt_CFLAGS = -DXVENDORNAME=\"X.org\ Foundation\" $(FONTTOSFNT_CFLAGS) -DXVENDORNAMESHORT=\"X.org\" -D_BSD_SOURCE
+AM_CFLAGS = -DXVENDORNAME=\"X.Org\ Foundation\" $(FONTTOSFNT_CFLAGS) -DXVENDORNAMESHORT=\"X.Org\" -D_BSD_SOURCE
 fonttosfnt_LDADD = $(FONTTOSFNT_LIBS) -lm
 
 fonttosfnt_SOURCES =	\
@@ -34,7 +34,7 @@ fonttosfnt_SOURCES =	\
 
 if NEED_SETENV
 fonttosfnt_SOURCES += env.c
-fonttosfnt_CFLAGS += -DNEED_SETENV
+AM_CFLAGS += -DNEED_SETENV
 endif
 
 appman_PRE = \
@@ -75,6 +75,6 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 .PHONY: ChangeLog
 
 ChangeLog:
-	git-log > ChangeLog
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 
 dist-hook: ChangeLog
diff --git a/app/fonttosfnt/Makefile.in b/app/fonttosfnt/Makefile.in
index 85df5ad3f..e245db91a 100644
--- a/app/fonttosfnt/Makefile.in
+++ b/app/fonttosfnt/Makefile.in
@@ -80,10 +80,9 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am__fonttosfnt_SOURCES_DIST = fonttosfnt.c fonttosfnt.h read.c \
 	struct.c util.c write.c env.c
-@NEED_SETENV_TRUE@am__objects_1 = fonttosfnt-env.$(OBJEXT)
-am_fonttosfnt_OBJECTS = fonttosfnt-fonttosfnt.$(OBJEXT) \
-	fonttosfnt-read.$(OBJEXT) fonttosfnt-struct.$(OBJEXT) \
-	fonttosfnt-util.$(OBJEXT) fonttosfnt-write.$(OBJEXT) \
+@NEED_SETENV_TRUE@am__objects_1 = env.$(OBJEXT)
+am_fonttosfnt_OBJECTS = fonttosfnt.$(OBJEXT) read.$(OBJEXT) \
+	struct.$(OBJEXT) util.$(OBJEXT) write.$(OBJEXT) \
 	$(am__objects_1)
 fonttosfnt_OBJECTS = $(am_fonttosfnt_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -133,6 +132,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -142,6 +142,7 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -216,9 +217,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-fonttosfnt_CFLAGS = -DXVENDORNAME=\"X.org\ Foundation\" \
-	$(FONTTOSFNT_CFLAGS) -DXVENDORNAMESHORT=\"X.org\" \
-	-D_BSD_SOURCE $(am__append_2)
+AM_CFLAGS = -DXVENDORNAME=\"X.Org\ Foundation\" $(FONTTOSFNT_CFLAGS) \
+	-DXVENDORNAMESHORT=\"X.Org\" -D_BSD_SOURCE $(am__append_2)
 fonttosfnt_LDADD = $(FONTTOSFNT_LIBS) -lm
 fonttosfnt_SOURCES = fonttosfnt.c fonttosfnt.h read.c struct.c util.c \
 	write.c $(am__append_1)
@@ -336,12 +336,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonttosfnt-env.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonttosfnt-fonttosfnt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonttosfnt-read.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonttosfnt-struct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonttosfnt-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonttosfnt-write.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonttosfnt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/struct.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -356,90 +356,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-fonttosfnt-fonttosfnt.o: fonttosfnt.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-fonttosfnt.o -MD -MP -MF "$(DEPDIR)/fonttosfnt-fonttosfnt.Tpo" -c -o fonttosfnt-fonttosfnt.o `test -f 'fonttosfnt.c' || echo '$(srcdir)/'`fonttosfnt.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-fonttosfnt.Tpo" "$(DEPDIR)/fonttosfnt-fonttosfnt.Po"; else rm -f "$(DEPDIR)/fonttosfnt-fonttosfnt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fonttosfnt.c' object='fonttosfnt-fonttosfnt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-fonttosfnt.o `test -f 'fonttosfnt.c' || echo '$(srcdir)/'`fonttosfnt.c
-
-fonttosfnt-fonttosfnt.obj: fonttosfnt.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-fonttosfnt.obj -MD -MP -MF "$(DEPDIR)/fonttosfnt-fonttosfnt.Tpo" -c -o fonttosfnt-fonttosfnt.obj `if test -f 'fonttosfnt.c'; then $(CYGPATH_W) 'fonttosfnt.c'; else $(CYGPATH_W) '$(srcdir)/fonttosfnt.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-fonttosfnt.Tpo" "$(DEPDIR)/fonttosfnt-fonttosfnt.Po"; else rm -f "$(DEPDIR)/fonttosfnt-fonttosfnt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fonttosfnt.c' object='fonttosfnt-fonttosfnt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-fonttosfnt.obj `if test -f 'fonttosfnt.c'; then $(CYGPATH_W) 'fonttosfnt.c'; else $(CYGPATH_W) '$(srcdir)/fonttosfnt.c'; fi`
-
-fonttosfnt-read.o: read.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-read.o -MD -MP -MF "$(DEPDIR)/fonttosfnt-read.Tpo" -c -o fonttosfnt-read.o `test -f 'read.c' || echo '$(srcdir)/'`read.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-read.Tpo" "$(DEPDIR)/fonttosfnt-read.Po"; else rm -f "$(DEPDIR)/fonttosfnt-read.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='read.c' object='fonttosfnt-read.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-read.o `test -f 'read.c' || echo '$(srcdir)/'`read.c
-
-fonttosfnt-read.obj: read.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-read.obj -MD -MP -MF "$(DEPDIR)/fonttosfnt-read.Tpo" -c -o fonttosfnt-read.obj `if test -f 'read.c'; then $(CYGPATH_W) 'read.c'; else $(CYGPATH_W) '$(srcdir)/read.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-read.Tpo" "$(DEPDIR)/fonttosfnt-read.Po"; else rm -f "$(DEPDIR)/fonttosfnt-read.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='read.c' object='fonttosfnt-read.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-read.obj `if test -f 'read.c'; then $(CYGPATH_W) 'read.c'; else $(CYGPATH_W) '$(srcdir)/read.c'; fi`
-
-fonttosfnt-struct.o: struct.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-struct.o -MD -MP -MF "$(DEPDIR)/fonttosfnt-struct.Tpo" -c -o fonttosfnt-struct.o `test -f 'struct.c' || echo '$(srcdir)/'`struct.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-struct.Tpo" "$(DEPDIR)/fonttosfnt-struct.Po"; else rm -f "$(DEPDIR)/fonttosfnt-struct.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='struct.c' object='fonttosfnt-struct.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-struct.o `test -f 'struct.c' || echo '$(srcdir)/'`struct.c
-
-fonttosfnt-struct.obj: struct.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-struct.obj -MD -MP -MF "$(DEPDIR)/fonttosfnt-struct.Tpo" -c -o fonttosfnt-struct.obj `if test -f 'struct.c'; then $(CYGPATH_W) 'struct.c'; else $(CYGPATH_W) '$(srcdir)/struct.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-struct.Tpo" "$(DEPDIR)/fonttosfnt-struct.Po"; else rm -f "$(DEPDIR)/fonttosfnt-struct.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='struct.c' object='fonttosfnt-struct.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-struct.obj `if test -f 'struct.c'; then $(CYGPATH_W) 'struct.c'; else $(CYGPATH_W) '$(srcdir)/struct.c'; fi`
-
-fonttosfnt-util.o: util.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-util.o -MD -MP -MF "$(DEPDIR)/fonttosfnt-util.Tpo" -c -o fonttosfnt-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-util.Tpo" "$(DEPDIR)/fonttosfnt-util.Po"; else rm -f "$(DEPDIR)/fonttosfnt-util.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='fonttosfnt-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
-
-fonttosfnt-util.obj: util.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-util.obj -MD -MP -MF "$(DEPDIR)/fonttosfnt-util.Tpo" -c -o fonttosfnt-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-util.Tpo" "$(DEPDIR)/fonttosfnt-util.Po"; else rm -f "$(DEPDIR)/fonttosfnt-util.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='fonttosfnt-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
-
-fonttosfnt-write.o: write.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-write.o -MD -MP -MF "$(DEPDIR)/fonttosfnt-write.Tpo" -c -o fonttosfnt-write.o `test -f 'write.c' || echo '$(srcdir)/'`write.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-write.Tpo" "$(DEPDIR)/fonttosfnt-write.Po"; else rm -f "$(DEPDIR)/fonttosfnt-write.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='write.c' object='fonttosfnt-write.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-write.o `test -f 'write.c' || echo '$(srcdir)/'`write.c
-
-fonttosfnt-write.obj: write.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-write.obj -MD -MP -MF "$(DEPDIR)/fonttosfnt-write.Tpo" -c -o fonttosfnt-write.obj `if test -f 'write.c'; then $(CYGPATH_W) 'write.c'; else $(CYGPATH_W) '$(srcdir)/write.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-write.Tpo" "$(DEPDIR)/fonttosfnt-write.Po"; else rm -f "$(DEPDIR)/fonttosfnt-write.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='write.c' object='fonttosfnt-write.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-write.obj `if test -f 'write.c'; then $(CYGPATH_W) 'write.c'; else $(CYGPATH_W) '$(srcdir)/write.c'; fi`
-
-fonttosfnt-env.o: env.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-env.o -MD -MP -MF "$(DEPDIR)/fonttosfnt-env.Tpo" -c -o fonttosfnt-env.o `test -f 'env.c' || echo '$(srcdir)/'`env.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-env.Tpo" "$(DEPDIR)/fonttosfnt-env.Po"; else rm -f "$(DEPDIR)/fonttosfnt-env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='env.c' object='fonttosfnt-env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-env.o `test -f 'env.c' || echo '$(srcdir)/'`env.c
-
-fonttosfnt-env.obj: env.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -MT fonttosfnt-env.obj -MD -MP -MF "$(DEPDIR)/fonttosfnt-env.Tpo" -c -o fonttosfnt-env.obj `if test -f 'env.c'; then $(CYGPATH_W) 'env.c'; else $(CYGPATH_W) '$(srcdir)/env.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonttosfnt-env.Tpo" "$(DEPDIR)/fonttosfnt-env.Po"; else rm -f "$(DEPDIR)/fonttosfnt-env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='env.c' object='fonttosfnt-env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fonttosfnt_CFLAGS) $(CFLAGS) -c -o fonttosfnt-env.obj `if test -f 'env.c'; then $(CYGPATH_W) 'env.c'; else $(CYGPATH_W) '$(srcdir)/env.c'; fi`
 uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
diff --git a/app/fonttosfnt/aclocal.m4 b/app/fonttosfnt/aclocal.m4
index 5419cfb3c..48f9f8de2 100644
--- a/app/fonttosfnt/aclocal.m4
+++ b/app/fonttosfnt/aclocal.m4
@@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.1.5
+	[XORG_MACROS_version=1.1.6
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
 		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
 		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
 		[$PVM],
 		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
diff --git a/app/fonttosfnt/config.h.in b/app/fonttosfnt/config.h.in
index c364eda45..ed276cb4d 100644
--- a/app/fonttosfnt/config.h.in
+++ b/app/fonttosfnt/config.h.in
@@ -1,5 +1,39 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define to 1 if you have the declaration of `va_copy', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VA_COPY
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
 /* Name of package */
 #undef PACKAGE
 
@@ -18,5 +52,17 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Version number of package */
 #undef VERSION
diff --git a/app/fonttosfnt/configure b/app/fonttosfnt/configure
index be2d45610..cffd4d981 100644
--- a/app/fonttosfnt/configure
+++ b/app/fonttosfnt/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fonttosfnt 1.0.3.
+# Generated by GNU Autoconf 2.59 for fonttosfnt 1.0.4.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,11 +269,48 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='fonttosfnt'
 PACKAGE_TARNAME='fonttosfnt'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='fonttosfnt 1.0.3'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='fonttosfnt 1.0.4'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE NEED_SETENV_TRUE NEED_SETENV_FALSE PKG_CONFIG ac_pt_PKG_CONFIG FONTTOSFNT_CFLAGS FONTTOSFNT_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP NEED_SETENV_TRUE NEED_SETENV_FALSE PKG_CONFIG ac_pt_PKG_CONFIG FONTTOSFNT_CFLAGS FONTTOSFNT_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -730,6 +767,10 @@ ac_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_env_CPPFLAGS_value=$CPPFLAGS
 ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
 ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
 ac_env_PKG_CONFIG_value=$PKG_CONFIG
 ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
@@ -750,7 +791,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fonttosfnt 1.0.3 to adapt to many kinds of systems.
+\`configure' configures fonttosfnt 1.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -816,7 +857,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fonttosfnt 1.0.3:";;
+     short | recursive ) echo "Configuration of fonttosfnt 1.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -841,6 +882,7 @@ Some influential environment variables:
               nonstandard directory <lib dir>
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
               headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
   FONTTOSFNT_CFLAGS
               C compiler flags for FONTTOSFNT, overriding pkg-config
@@ -946,7 +988,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-fonttosfnt configure 1.0.3
+fonttosfnt configure 1.0.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -960,7 +1002,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fonttosfnt $as_me 1.0.3, which was
+It was created by fonttosfnt $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1558,7 +1600,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='fonttosfnt'
- VERSION='1.0.3'
+ VERSION='1.0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2998,6 +3040,672 @@ else
 fi
 
 
+for ac_func in vasprintf
+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
+if eval "test \"\${$as_ac_var+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.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ac_ext=c
+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
+# 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
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { 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
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+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 for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+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.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  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
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core 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
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+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
+if eval "test \"\${$as_ac_Header+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
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+echo "$as_me:$LINENO: checking whether va_copy is declared" >&5
+echo $ECHO_N "checking whether va_copy is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl_va_copy+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
+	#include <stdarg.h>
+
+
+int
+main ()
+{
+#ifndef va_copy
+  char *p = (char *) va_copy;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_have_decl_va_copy=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_va_copy=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl_va_copy" >&5
+echo "${ECHO_T}$ac_cv_have_decl_va_copy" >&6
+if test $ac_cv_have_decl_va_copy = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VA_COPY 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VA_COPY 0
+_ACEOF
+
+
+fi
+
+
+
 
 
 if test x$have_setenv = xno; then
@@ -3374,7 +4082,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
@@ -3383,7 +4091,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -3785,7 +4493,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by fonttosfnt $as_me 1.0.3, which was
+This file was extended by fonttosfnt $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3848,7 +4556,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-fonttosfnt config.status 1.0.3
+fonttosfnt config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -4087,6 +4795,8 @@ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
 s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
 s,@NEED_SETENV_TRUE@,$NEED_SETENV_TRUE,;t t
 s,@NEED_SETENV_FALSE@,$NEED_SETENV_FALSE,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
diff --git a/app/fonttosfnt/configure.ac b/app/fonttosfnt/configure.ac
index 5e52eb06b..0782b0351 100644
--- a/app/fonttosfnt/configure.ac
+++ b/app/fonttosfnt/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(fonttosfnt,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fonttosfnt)
+AC_INIT(fonttosfnt,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fonttosfnt)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -32,6 +32,11 @@ AC_PROG_CC
 AC_PROG_INSTALL
 
 AC_CHECK_FUNC(setenv, have_setenv=yes, have_setenv=no)
+AC_CHECK_FUNCS([vasprintf])
+AC_CHECK_DECLS([va_copy], [], [], [
+	AC_INCLUDES_DEFAULT
+	#include <stdarg.h>
+])
 
 AM_CONDITIONAL(NEED_SETENV, [test x$have_setenv = xno])
 
diff --git a/app/fonttosfnt/fonttosfnt.c b/app/fonttosfnt/fonttosfnt.c
index e8e41b08d..78c6b7e82 100644
--- a/app/fonttosfnt/fonttosfnt.c
+++ b/app/fonttosfnt/fonttosfnt.c
@@ -58,10 +58,10 @@ main(int argc, char **argv)
 
         if(argv[i][1] == 'o') {
             if(argv[i][2] == '\0') {
-                output = sprintf_reliable("%s", argv[i + 1]);
+                output = sprintf_alloc("%s", argv[i + 1]);
                 i += 2;
             } else {
-                output = sprintf_reliable("%s", argv[i] + 2);
+                output = sprintf_alloc("%s", argv[i] + 2);
                 i++;
             }
         } else if(strcmp(argv[i], "-v") == 0) {
diff --git a/app/fonttosfnt/fonttosfnt.h b/app/fonttosfnt/fonttosfnt.h
index b7392a77b..d6aa0045f 100644
--- a/app/fonttosfnt/fonttosfnt.h
+++ b/app/fonttosfnt/fonttosfnt.h
@@ -24,6 +24,10 @@ THE SOFTWARE.
 #ifndef _FONTTOSFNT_H_
 #define _FONTTOSFNT_H_ 1
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdarg.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -162,8 +166,8 @@ int writeFile(char *filename, FontPtr);
 #define PROP_INTEGER 2
 #define PROP_CARDINAL 3
 
-char *sprintf_reliable(char *f, ...);
-char *vsprintf_reliable(char *f, va_list args);
+char *sprintf_alloc(char *f, ...);
+char *vsprintf_alloc(char *f, va_list args);
 char *makeUTF16(char *);
 unsigned makeName(char*);
 int macTime(int *, unsigned *);
diff --git a/app/fonttosfnt/read.c b/app/fonttosfnt/read.c
index 501bc339a..440d50a58 100644
--- a/app/fonttosfnt/read.c
+++ b/app/fonttosfnt/read.c
@@ -109,29 +109,29 @@ readFile(char *filename, FontPtr font)
         BDF_PropertyRec prop;
         int rc, i;
         if(strcmp(face->style_name, "Regular") == 0)
-            full_name = sprintf_reliable("%s", face->family_name);
+            full_name = sprintf_alloc("%s", face->family_name);
         else
-            full_name = sprintf_reliable("%s %s", 
-                                         face->family_name, face->style_name);
+            full_name = sprintf_alloc("%s %s", 
+                                      face->family_name, face->style_name);
 
         /* The unique name doesn't actually need to be globally
            unique; it only needs to be unique among all installed fonts on a
            Windows system.  We don't bother getting it quite right. */
         if(face->num_fixed_sizes <= 0)
-            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT" bitmap"
-					   , full_name);
+            unique_name = sprintf_alloc("%s "XVENDORNAMESHORT" bitmap",
+                                        full_name);
         else if(face->available_sizes[0].width == 
                 face->available_sizes[0].height)
-            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT
+            unique_name = sprintf_alloc("%s "XVENDORNAMESHORT
 					   " bitmap size %d",
                                            full_name, 
                                            face->available_sizes[0].height);
         else
-            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT
-					   " bitmap size %dx%d",
-                                           full_name, 
-                                           face->available_sizes[0].width,
-                                           face->available_sizes[0].height);
+            unique_name = sprintf_alloc("%s "XVENDORNAMESHORT
+                                        " bitmap size %dx%d",
+                                        full_name, 
+                                        face->available_sizes[0].width,
+                                        face->available_sizes[0].height);
 
         font->names = malloc(10 * sizeof(FontNameEntryRec));
         if(font->names == NULL) {
@@ -238,20 +238,20 @@ readFile(char *filename, FontPtr font)
         if(verbose_flag)
             fprintf(stderr, "size %d: %dx%d\n",
                     i, 
-                    face->available_sizes[i].width, 
-                    face->available_sizes[i].height);
+                    face->available_sizes[i].x_ppem >> 6, 
+                    face->available_sizes[i].y_ppem >> 6);
 
         rc = FT_Set_Pixel_Sizes(face,
-                                face->available_sizes[i].width,
-                                face->available_sizes[i].height);
+                                face->available_sizes[i].x_ppem >> 6,
+                                face->available_sizes[i].y_ppem >> 6);
         if(rc != 0) {
             fprintf(stderr, "Couldn't set size.\n");
             return -1;
         }
 
         strike = makeStrike(font, 
-                            face->available_sizes[i].width,
-                            face->available_sizes[i].height);
+                            face->available_sizes[i].x_ppem >> 6,
+                            face->available_sizes[i].y_ppem >> 6);
         if(strike == NULL) {
             fprintf(stderr, "Couldn't allocate strike.\n");
             return -1;
diff --git a/app/fonttosfnt/util.c b/app/fonttosfnt/util.c
index 2d0d1c0ae..72ca9b978 100644
--- a/app/fonttosfnt/util.c
+++ b/app/fonttosfnt/util.c
@@ -69,28 +69,49 @@ extern void unsetenv(const char *name);
 #endif
 
 char*
-sprintf_reliable(char *f, ...)
+sprintf_alloc(char *f, ...)
 {
     char *s;
     va_list args;
     va_start(args, f);
-    s = vsprintf_reliable(f, args);
+    s = vsprintf_alloc(f, args);
     va_end(args);
     return s;
-}    
+}
 
+#if HAVE_VASPRINTF
 char*
-vsprintf_reliable(char *f, va_list args)
+vsprintf_alloc(char *f, va_list args)
+{
+    char *r;
+    int rc;
+
+    rc = vasprintf(&r, f, args);
+    if(rc < 0)
+        return NULL;
+    return r;
+}
+#else
+char*
+vsprintf_alloc(char *f, va_list args)
 {
     int n, size = 12;
     char *string;
+    va_list args_copy;
+
     while(1) {
         if(size > 4096)
             return NULL;
         string = malloc(size);
         if(!string)
             return NULL;
+
+#if HAVE_DECL_VA_COPY
+        va_copy(args_copy, args);
+        n = vsnprintf(string, size, f, args_copy);
+#else
         n = vsnprintf(string, size, f, args);
+#endif
         if(n >= 0 && n < size)
             return string;
         else if(n >= size)
@@ -101,6 +122,7 @@ vsprintf_reliable(char *f, va_list args)
     }
     /* NOTREACHED */
 }
+#endif
 
 /* Build a UTF-16 string from a Latin-1 string.  
    Result is not NUL-terminated. */
@@ -376,7 +398,7 @@ faceEncoding(FT_Face face)
     if(rc != 0 || p2.type != BDF_PROPERTY_TYPE_ATOM)
         return NULL;
 
-    return sprintf_reliable("%s-%s", p1.u.atom, p2.u.atom);
+    return sprintf_alloc("%s-%s", p1.u.atom, p2.u.atom);
 }
     
 int
diff --git a/app/fonttosfnt/write.c b/app/fonttosfnt/write.c
index 42ccec36f..318adeff5 100644
--- a/app/fonttosfnt/write.c
+++ b/app/fonttosfnt/write.c
@@ -358,7 +358,7 @@ writeDir(FILE *out, FontPtr font, int numTables, unsigned *tables)
     writeULONG(out, 0x10000);   /* version */
     writeUSHORT(out, numTables); /* numTables */
     writeUSHORT(out, 16 * ti);  /* searchRange */
-    writeUSHORT(out, i - 1);    /* entrySelector */
+    writeUSHORT(out, i);        /* entrySelector */
     writeUSHORT(out, 16 * (numTables - ti)); /* rangeShift */
 
     /* see fixupDir */
@@ -1030,7 +1030,7 @@ writeOS2(FILE* out, FontPtr font)
 static int 
 writePCLT(FILE* out, FontPtr font)
 {
-    char name[16] = XVENDORNAME" font    ";
+    char name[16] = "X11 font        ";
     char filename[6] = "X11R00";
     unsigned char charComplement[8] = 
         {0xFF, 0xFF, 0xFF, 0xFF, 0x0B, 0xFF, 0xFF, 0xFE};