build system: some cleanup and better pTeX integration

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

16 files changed, 124 insertions, 31 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index a940b5efb39..1e1b8f5d669 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (sub_dirs): Removed, former ptexdir/lib/ is now
+	integrated into lib/.
+	* configure.ac (ptexdir/lib/Makefile.am): Removed.
+
 2010-04-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* help.h (PBIBTEXHELP, PDVITYPEHELP, PPLTOTFHELP, PTFTOPLHELP):
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 12367d67600..69d57c5308e 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -17,8 +17,7 @@ AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 
 version = $(WEB2CVERSION)
 
-sub_dirs = lib
-SUBDIRS = doc $(sub_dirs) man web2c . window omegafonts otps
+SUBDIRS = doc lib man web2c . window omegafonts otps
 
 proglib = lib/lib.a
 
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 83bd39bab8f..a33bf935b09 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1163,8 +1163,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
 AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 version = $(WEB2CVERSION)
-sub_dirs = lib ptexdir/lib
-SUBDIRS = doc $(sub_dirs) man web2c . window omegafonts otps
+SUBDIRS = doc lib man web2c . window omegafonts otps
 proglib = lib/lib.a
 dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 nodist_man_MANS = 
@@ -1616,11 +1615,11 @@ etex_ch_srcs = \
 # e-TeX Tests
 #
 etex_tests = etexdir/etrip.test
-pproglib = ptexdir/lib/lib.a
 ptex_cppflags = $(PTEXENC_INCLUDES)
 ptex_ldadd = $(pproglib) $(PTEXENC_LIBS) $(LDADD)
 pweb_programs = pbibtex pdvitype ptftopl ppltotf
 p_tangle = WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
+pproglib = lib/libp.a
 ptex_CPPFLAGS = $(ptex_cppflags)
 ptex_CFLAGS = $(WARNING_CFLAGS)
 
@@ -8975,10 +8974,9 @@ etrip-clean:
 	rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ
 	rm -f tripos.tex 8terminal.tex
 	rm -rf tfm
-
 # Rebuild $(pproglib)
-$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/ptexdir/lib/*.c
-	cd ptexdir/lib && $(MAKE) $(AM_MAKEFLAGS)
+$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
+	cd lib && $(MAKE) $(AM_MAKEFLAGS)
 @PTEXENC_RULE@
 $(ptex_OBJECTS): $(ptex_prereq)
 
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index fc23a1d23e8..399b6639116 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -22010,7 +22010,7 @@ fi
 subdirs="$subdirs web2c"
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile omegafonts/Makefile otps/Makefile ptexdir/lib/Makefile window/Makefile"
+ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile omegafonts/Makefile otps/Makefile window/Makefile"
 
 ac_config_files="$ac_config_files web2c-sh"
 
@@ -23210,7 +23210,6 @@ do
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "omegafonts/Makefile") CONFIG_FILES="$CONFIG_FILES omegafonts/Makefile" ;;
     "otps/Makefile") CONFIG_FILES="$CONFIG_FILES otps/Makefile" ;;
-    "ptexdir/lib/Makefile") CONFIG_FILES="$CONFIG_FILES ptexdir/lib/Makefile" ;;
     "window/Makefile") CONFIG_FILES="$CONFIG_FILES window/Makefile" ;;
     "web2c-sh") CONFIG_FILES="$CONFIG_FILES web2c-sh" ;;
     "tangle-sh") CONFIG_FILES="$CONFIG_FILES tangle-sh" ;;
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index b0f3e4cc04b..ff09815ffe9 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -354,7 +354,7 @@ AC_CONFIG_SUBDIRS([web2c])
 
 AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile
                  omegafonts/Makefile otps/Makefile
-                 ptexdir/lib/Makefile window/Makefile])
+                 window/Makefile])
 AC_CONFIG_FILES([web2c-sh], [chmod +x web2c-sh])
 AC_CONFIG_FILES([tangle-sh], [chmod +x tangle-sh])
 AC_CONFIG_FILES([ctangleboot-sh], [chmod +x ctangleboot-sh])
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 50d68cf357f..86e29509d6e 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -7,6 +7,11 @@
 	* lib.h: Move extern declaration of fullnameoffile to here ...
 	* texmfmp.c: ... from here ...
 	* openclose.c: ... and from here.
+	* texmfmp.c [XeTeX]: Move extern declarations of papersize and
+	outputdriver from here to ../xetexdir/XeTeX_ext.h.
+
+	* Makefile.am, openclose.c, printversion.c:
+	Integrate libp.a for pTeX.
 
 2010-04-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/web2c/lib/Makefile.am b/Build/source/texk/web2c/lib/Makefile.am
index 2257fd1ad13..e6b368a3fdf 100644
--- a/Build/source/texk/web2c/lib/Makefile.am
+++ b/Build/source/texk/web2c/lib/Makefile.am
@@ -10,6 +10,10 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 @KPATHSEA_RULE@
 
 noinst_LIBRARIES = lib.a
+if PTEX
+noinst_LIBRARIES += libp.a
+endif PTEX
+EXTRA_LIBRARIES = libp.a
 
 ## We don't compile `texmfmp.c'; this file is converted into 'texextra.c'
 ## for TeX, 'mfextra.c' for Metafont, ...
@@ -31,6 +35,13 @@ lib_a_SOURCES = \
 	version.c \
 	zround.c
 
+## Replacements for pTeX.
+##
+libp_a_CPPFLAGS = -DPTEX $(ENCTEX_INCLUDES)
+libp_a_SOURCES = \
+	openclose.c \
+	printversion.c
+
 ## Not yet used
 ##
 EXTRA_DIST = alloca.c win32main.c
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 87be2f8e63b..a5d87322f0f 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -34,6 +34,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@PTEX_TRUE@am__append_1 = libp.a
 subdir = lib
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	ChangeLog
@@ -85,6 +86,11 @@ am_lib_a_OBJECTS = basechsuffix.$(OBJEXT) chartostring.$(OBJEXT) \
 	uexit.$(OBJEXT) usage.$(OBJEXT) version.$(OBJEXT) \
 	zround.$(OBJEXT)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
+libp_a_AR = $(AR) $(ARFLAGS)
+libp_a_LIBADD =
+am_libp_a_OBJECTS = libp_a-openclose.$(OBJEXT) \
+	libp_a-printversion.$(OBJEXT)
+libp_a_OBJECTS = $(am_libp_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -98,8 +104,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(lib_a_SOURCES)
-DIST_SOURCES = $(lib_a_SOURCES)
+SOURCES = $(lib_a_SOURCES) $(libp_a_SOURCES)
+DIST_SOURCES = $(lib_a_SOURCES) $(libp_a_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -293,7 +299,8 @@ x_ext_lib = @x_ext_lib@
 x_tool_libs = @x_tool_libs@
 INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
-noinst_LIBRARIES = lib.a
+noinst_LIBRARIES = lib.a $(am__append_1)
+EXTRA_LIBRARIES = libp.a
 lib_a_SOURCES = \
 	basechsuffix.c \
 	chartostring.c \
@@ -312,6 +319,11 @@ lib_a_SOURCES = \
 	version.c \
 	zround.c
 
+libp_a_CPPFLAGS = -DPTEX $(ENCTEX_INCLUDES)
+libp_a_SOURCES = \
+	openclose.c \
+	printversion.c
+
 EXTRA_DIST = alloca.c win32main.c
 all: all-am
 
@@ -354,6 +366,10 @@ lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
 	-rm -f lib.a
 	$(lib_a_AR) lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
 	$(RANLIB) lib.a
+libp.a: $(libp_a_OBJECTS) $(libp_a_DEPENDENCIES) 
+	-rm -f libp.a
+	$(libp_a_AR) libp.a $(libp_a_OBJECTS) $(libp_a_LIBADD)
+	$(RANLIB) libp.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -368,6 +384,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fprintreal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input2int.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inputint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libp_a-openclose.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libp_a-printversion.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openclose.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printversion.Po@am__quote@
@@ -398,6 +416,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libp_a-openclose.o: openclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libp_a-openclose.o -MD -MP -MF $(DEPDIR)/libp_a-openclose.Tpo -c -o libp_a-openclose.o `test -f 'openclose.c' || echo '$(srcdir)/'`openclose.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libp_a-openclose.Tpo $(DEPDIR)/libp_a-openclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='openclose.c' object='libp_a-openclose.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libp_a-openclose.o `test -f 'openclose.c' || echo '$(srcdir)/'`openclose.c
+
+libp_a-openclose.obj: openclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libp_a-openclose.obj -MD -MP -MF $(DEPDIR)/libp_a-openclose.Tpo -c -o libp_a-openclose.obj `if test -f 'openclose.c'; then $(CYGPATH_W) 'openclose.c'; else $(CYGPATH_W) '$(srcdir)/openclose.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libp_a-openclose.Tpo $(DEPDIR)/libp_a-openclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='openclose.c' object='libp_a-openclose.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libp_a-openclose.obj `if test -f 'openclose.c'; then $(CYGPATH_W) 'openclose.c'; else $(CYGPATH_W) '$(srcdir)/openclose.c'; fi`
+
+libp_a-printversion.o: printversion.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libp_a-printversion.o -MD -MP -MF $(DEPDIR)/libp_a-printversion.Tpo -c -o libp_a-printversion.o `test -f 'printversion.c' || echo '$(srcdir)/'`printversion.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libp_a-printversion.Tpo $(DEPDIR)/libp_a-printversion.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printversion.c' object='libp_a-printversion.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libp_a-printversion.o `test -f 'printversion.c' || echo '$(srcdir)/'`printversion.c
+
+libp_a-printversion.obj: printversion.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libp_a-printversion.obj -MD -MP -MF $(DEPDIR)/libp_a-printversion.Tpo -c -o libp_a-printversion.obj `if test -f 'printversion.c'; then $(CYGPATH_W) 'printversion.c'; else $(CYGPATH_W) '$(srcdir)/printversion.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libp_a-printversion.Tpo $(DEPDIR)/libp_a-printversion.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printversion.c' object='libp_a-printversion.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libp_a-printversion.obj `if test -f 'printversion.c'; then $(CYGPATH_W) 'printversion.c'; else $(CYGPATH_W) '$(srcdir)/printversion.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c
index a753cceb8de..a0d5f0bb35a 100644
--- a/Build/source/texk/web2c/lib/openclose.c
+++ b/Build/source/texk/web2c/lib/openclose.c
@@ -8,6 +8,9 @@
 #include <kpathsea/tex-file.h>
 #include <kpathsea/variable.h>
 #include <kpathsea/absolute.h>
+#ifdef PTEX
+#include <ptexenc/ptexenc.h>
+#endif
 
 /* The globals we use to communicate.  */
 extern string nameoffile;
@@ -188,6 +191,12 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode)
                 free (fname);
 
                 /* This fopen is not allowed to fail. */
+#ifdef PTEX
+                if (filefmt == kpse_tex_format ||
+                    filefmt == kpse_bib_format) {
+                    *f_ptr = nkf_open (nameoffile + 1, fopen_mode);
+                } else
+#endif
                 *f_ptr = xfopen (nameoffile + 1, fopen_mode);
             }
         }
@@ -274,7 +283,11 @@ close_file (FILE *f)
   if (!f)
     return;
     
+#ifdef PTEX
+  if (nkf_close (f) == EOF) {
+#else
   if (fclose (f) == EOF) {
+#endif
     /* It's not always nameoffile, we might have opened something else
        in the meantime.  And it's not easy to extract the filenames out
        of the pool array.  So just punt on the filename.  Sigh.  This
diff --git a/Build/source/texk/web2c/lib/printversion.c b/Build/source/texk/web2c/lib/printversion.c
index 2cfb751d58f..85399a44916 100644
--- a/Build/source/texk/web2c/lib/printversion.c
+++ b/Build/source/texk/web2c/lib/printversion.c
@@ -5,6 +5,9 @@
 #include "config.h"
 #include "lib.h"
 #include <kpathsea/version.h>
+#ifdef PTEX
+#include <ptexenc/ptexenc.h>
+#endif
 
 /* We're passed in the original WEB banner string, which has the form
 This is PROGRAM, Version VERSION-NUMBER
@@ -36,8 +39,16 @@ printversionandexit (const_string banner,
   prog_name[len] = 0;
 
   /* The Web2c version string starts with a space.  */
+#ifdef PTEX
+  printf ("%s %s (%s)%s\n", prog_name, prog_version, get_enc_string(),
+          versionstring);
+#else
   printf ("%s %s%s\n", prog_name, prog_version, versionstring);
+#endif
   puts (kpathsea_version_string);
+#ifdef PTEX
+  puts (ptexenc_version_string);
+#endif
 
   if (copyright_holder) {
     printf ("Copyright 2009 %s.\n", copyright_holder);
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index ed624d134d7..d5781f8dcbb 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -1404,10 +1404,8 @@ parse_options (int argc, string *argv)
 
 #ifdef XeTeX
     } else if (ARGUMENT_IS ("papersize")) {
-      extern const_string papersize;
       papersize = optarg;
     } else if (ARGUMENT_IS ("output-driver")) {
-      extern const_string outputdriver;
       outputdriver = optarg;
 #endif
 
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 09af5986fdd..db627a6cf5a 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -13,7 +13,7 @@
 	* pbibtex.defines (removed): Using ptex.defines.
 	* ptex-include.ch (removed): Now done in ../texmfmp.h.
 
-	* am/ptex.am: Adjusted.
+	* am/ptex.am: Adjust and replace lib/lib.a by ../lib/libp.a.
 
 2010-04-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 9d0b5180824..876474fee69 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -3,18 +3,6 @@
 ## Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
-## pTeX library
-##
-
-sub_dirs += ptexdir/lib
-pproglib = ptexdir/lib/lib.a
-
-# Rebuild $(pproglib)
-$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/ptexdir/lib/*.c
-	cd ptexdir/lib && $(MAKE) $(AM_MAKEFLAGS)
-## Rebuild libptexenc
-@PTEXENC_RULE@
-
 ptex_cppflags = $(PTEXENC_INCLUDES)
 ptex_ldadd = $(pproglib) $(PTEXENC_LIBS) $(LDADD)
 
@@ -25,6 +13,15 @@ p_tangle = WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
 DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
 	$(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
 
+## pTeX library
+##
+pproglib = lib/libp.a
+# Rebuild $(pproglib)
+$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
+	cd lib && $(MAKE) $(AM_MAKEFLAGS)
+## Rebuild libptexenc
+@PTEXENC_RULE@
+
 ## pTeX
 ##
 if PTEX
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index fd65ae30ad9..59454af992d 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* XeTeX_ext.h: Move extern declarations of papersize and
+	outputdriver from ../lib/texmfmp.c to here; use 'const char *',
+	'const_string' is not defined in this file.
+	* XeTeX_ext.c (papersize, outputdriver): Use 'const char *'.
+
 2010-03-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* XeTeXLayoutInterface.cpp: #include "unicode/platform.h" first,
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index d06f83748d6..976e81319a1 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -182,8 +182,8 @@ const UInt32 byteMark				= 0x00000080UL;
 
 
 /* if the user specifies a paper size or output driver program */
-const_string papersize;
-const_string outputdriver = "xdvipdfmx -q -E"; /* default to portable xdvipdfmx driver */
+const char *papersize;
+const char *outputdriver = "xdvipdfmx -q -E"; /* default to portable xdvipdfmx driver */
 
 
 void initversionstring(char **versions)
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
index b17cad6496c..9dcfde35d24 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
@@ -208,6 +208,9 @@ extern const UInt32 kSurrogateLowEnd;
 extern const UInt32 byteMask;
 extern const UInt32 byteMark;
 
+extern const char *papersize;
+extern const char *outputdriver;
+
 #include <stdio.h> /* for FILE */
 
 #include "trans.h"