libs/poppler, libs/xpdf: Add compiler options to suppress 'deprecatedconversion' warnings from g++-4.4

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

21 files changed, 264 insertions, 144 deletions

diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 206149cce31..4b51a742f0d 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -106,11 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
 	$(top_srcdir)/../texk/makejvf/ac/withenable.ac \
 	$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
-	$(top_srcdir)/../texk/musixflx/ac/withenable.ac \
 	$(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \
 	$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
 	$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
 	$(top_srcdir)/../texk/ttf2pk/ac/withenable.ac \
+	$(top_srcdir)/../texk/ttf2pk2/ac/withenable.ac \
 	$(top_srcdir)/../texk/ttfdump/ac/withenable.ac \
 	$(top_srcdir)/../texk/xdv2pdf/ac/withenable.ac \
 	$(top_srcdir)/../texk/xdvik/ac/withenable.ac \
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 5e0b15d13cc..b764e001f02 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -751,11 +751,11 @@ enable_updmap
 enable_makeindexk
 enable_makejvf
 enable_mendexk
-enable_musixflx
 enable_ps2pkm
 enable_seetexk
 enable_tex4htk
 enable_ttf2pk
+enable_ttf2pk2
 enable_ttfdump
 enable_xdv2pdf
 enable_xdvik
@@ -1532,11 +1532,11 @@ Optional Features:
   --disable-makeindexk    do not build the makeindexk package
   --disable-makejvf       do not build the makejvf package
   --disable-mendexk       do not build the mendexk package
-  --disable-musixflx      do not build the musixflx package
   --disable-ps2pkm        do not build the ps2pkm package
   --disable-seetexk       do not build the seetexk package
   --disable-tex4htk       do not build the tex4htk package
   --disable-ttf2pk        do not build the ttf2pk package
+  --enable-ttf2pk2        build the ttf2pk2 package
   --disable-ttfdump       do not build the ttfdump package
   --disable-xdv2pdf       do not build the xdv2pdf package
   --disable-xdvik         do not build the xdvik package
@@ -4227,25 +4227,6 @@ test "x$enable_mendexk" = xno || {
 }
 
 
-## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/
-## configure options and TL libraries required for musixflx
-# Check whether --enable-musixflx was given.
-if test "${enable_musixflx+set}" = set; then :
-  enableval=$enable_musixflx;
-fi
-case $enable_musixflx in #(
-  yes|no) :
-     ;; #(
-  *) :
-
-   enable_musixflx=$enable_all_pkgs
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixflx=$enable_musixflx'" >&5
-$as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-musixflx=$enable_musixflx'"
-    ;;
-esac
-
-
 ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
 ## configure options and TL libraries required for ps2pkm
 # Check whether --enable-ps2pkm was given.
@@ -4339,6 +4320,30 @@ test "x$enable_ttf2pk" = xno || {
 }
 
 
+## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/
+## configure options and TL libraries required for ttf2pk
+# Check whether --enable-ttf2pk2 was given.
+if test "${enable_ttf2pk2+set}" = set; then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=no
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'"
+    ;;
+esac
+
+test "x$enable_ttf2pk2" = xno || {
+  need_kpathsea=yes
+  need_freetype2=yes
+}
+
+
 ## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
 ## configure options and TL libraries required for ttfdump
 # Check whether --enable-ttfdump was given.
diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure
index 23b3745a23f..f5e960eb599 100755
--- a/Build/source/libs/gd/configure
+++ b/Build/source/libs/gd/configure
@@ -769,8 +769,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
diff --git a/Build/source/libs/gd/configure.ac b/Build/source/libs/gd/configure.ac
index cc792229cda..fb51f497881 100644
--- a/Build/source/libs/gd/configure.ac
+++ b/Build/source/libs/gd/configure.ac
@@ -1,15 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([gd_major], [2])[]dnl
-m4_define([gd_minor], [0])[]dnl
-m4_define([gd_micro], [35])[]dnl using unmodified gd-2.0.35 source tree
-m4_define([gd_version], gd_major.gd_minor.gd_micro)[]dnl
+m4_define([gd_version], [2.0.35])[]dnl using unmodified gd source tree
 AC_INIT([gd for TeX Live], gd_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([gd-]gd_version[/gd.c])
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 38f011fd39f..f1168ff8f7d 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,18 @@
+2011-04-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (goo_libGoo_a_sources): Omit PNGWriter.cc.
+
+2011-04-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Suppress "deprecated conversion from string constant to 'char*'"
+	warnings from g++-4.4.
+	Unfortunately poppler declares lots of function parameters as
+	'char *' that should actually be 'const char *'.
+	Compiling with the g++-4.4 default '-Wwrite-strings' would yield
+	>10000 such warnings.
+
+	* Makefile.am, configure.ac: Define and use NO_WARN_CXXFLAGS.
+
 2011-04-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, ac/poppler.ac, ac/withenable.ac, configure.ac:
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index 9d443e43dee..6cb693975e9 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -33,6 +33,7 @@ POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler
 INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES)
 AM_CPPFLAGS = -DPDF_PARSER_ONLY -DPOPPLER_DATADIR='"."'
 AM_CFLAGS = $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(NO_WARN_CXXFLAGS)
 
 noinst_LIBRARIES = libpoppler.a
 
@@ -50,9 +51,7 @@ goo_libGoo_a_sources = \
 	$(GOO_SRC)/GooList.cc \
 	$(GOO_SRC)/GooString.cc \
 	$(GOO_SRC)/GooTimer.cc \
-	$(GOO_SRC)/gstrtod.cc \
-	$(GOO_SRC)/PNGWriter.cc
-
+	$(GOO_SRC)/gstrtod.cc
 
 fofi_libfofi_a_sources = \
 	$(FOFI_SRC)/FoFiBase.cc \
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 6b61a22dafb..43406459036 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -62,8 +62,7 @@ libpoppler_a_AR = $(AR) $(ARFLAGS)
 libpoppler_a_LIBADD =
 am__objects_1 = FixedPoint.$(OBJEXT) gfile.$(OBJEXT) gmem.$(OBJEXT) \
 	gmempp.$(OBJEXT) GooHash.$(OBJEXT) GooList.$(OBJEXT) \
-	GooString.$(OBJEXT) GooTimer.$(OBJEXT) gstrtod.$(OBJEXT) \
-	PNGWriter.$(OBJEXT)
+	GooString.$(OBJEXT) GooTimer.$(OBJEXT) gstrtod.$(OBJEXT)
 am__objects_2 = FoFiBase.$(OBJEXT) FoFiEncodings.$(OBJEXT) \
 	FoFiTrueType.$(OBJEXT) FoFiType1.$(OBJEXT) \
 	FoFiType1C.$(OBJEXT)
@@ -188,6 +187,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NO_WARN_CXXFLAGS = @NO_WARN_CXXFLAGS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -260,6 +260,7 @@ POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler
 INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES)
 AM_CPPFLAGS = -DPDF_PARSER_ONLY -DPOPPLER_DATADIR='"."'
 AM_CFLAGS = $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(NO_WARN_CXXFLAGS)
 noinst_LIBRARIES = libpoppler.a
 nodist_libpoppler_a_SOURCES = \
 	$(goo_libGoo_a_sources) \
@@ -275,8 +276,7 @@ goo_libGoo_a_sources = \
 	$(GOO_SRC)/GooList.cc \
 	$(GOO_SRC)/GooString.cc \
 	$(GOO_SRC)/GooTimer.cc \
-	$(GOO_SRC)/gstrtod.cc \
-	$(GOO_SRC)/PNGWriter.cc
+	$(GOO_SRC)/gstrtod.cc
 
 fofi_libfofi_a_sources = \
 	$(FOFI_SRC)/FoFiBase.cc \
@@ -452,7 +452,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OutputDev.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDoc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDocEncoding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PNGWriter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSOutputDev.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSTokenizer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Page.Po@am__quote@
@@ -614,20 +613,6 @@ gstrtod.obj: $(GOO_SRC)/gstrtod.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gstrtod.obj `if test -f '$(GOO_SRC)/gstrtod.cc'; then $(CYGPATH_W) '$(GOO_SRC)/gstrtod.cc'; else $(CYGPATH_W) '$(srcdir)/$(GOO_SRC)/gstrtod.cc'; fi`
 
-PNGWriter.o: $(GOO_SRC)/PNGWriter.cc
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PNGWriter.o -MD -MP -MF $(DEPDIR)/PNGWriter.Tpo -c -o PNGWriter.o `test -f '$(GOO_SRC)/PNGWriter.cc' || echo '$(srcdir)/'`$(GOO_SRC)/PNGWriter.cc
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/PNGWriter.Tpo $(DEPDIR)/PNGWriter.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(GOO_SRC)/PNGWriter.cc' object='PNGWriter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PNGWriter.o `test -f '$(GOO_SRC)/PNGWriter.cc' || echo '$(srcdir)/'`$(GOO_SRC)/PNGWriter.cc
-
-PNGWriter.obj: $(GOO_SRC)/PNGWriter.cc
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PNGWriter.obj -MD -MP -MF $(DEPDIR)/PNGWriter.Tpo -c -o PNGWriter.obj `if test -f '$(GOO_SRC)/PNGWriter.cc'; then $(CYGPATH_W) '$(GOO_SRC)/PNGWriter.cc'; else $(CYGPATH_W) '$(srcdir)/$(GOO_SRC)/PNGWriter.cc'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/PNGWriter.Tpo $(DEPDIR)/PNGWriter.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(GOO_SRC)/PNGWriter.cc' object='PNGWriter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PNGWriter.obj `if test -f '$(GOO_SRC)/PNGWriter.cc'; then $(CYGPATH_W) '$(GOO_SRC)/PNGWriter.cc'; else $(CYGPATH_W) '$(srcdir)/$(GOO_SRC)/PNGWriter.cc'; fi`
-
 FoFiBase.o: $(FOFI_SRC)/FoFiBase.cc
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FoFiBase.o -MD -MP -MF $(DEPDIR)/FoFiBase.Tpo -c -o FoFiBase.o `test -f '$(FOFI_SRC)/FoFiBase.cc' || echo '$(srcdir)/'`$(FOFI_SRC)/FoFiBase.cc
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/FoFiBase.Tpo $(DEPDIR)/FoFiBase.Po
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index 4a634bb3564..ff66c944ef5 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -616,6 +616,7 @@ ZLIB_INCLUDES
 EGREP
 GREP
 CPP
+NO_WARN_CXXFLAGS
 WARNING_CXXFLAGS
 WARNING_CFLAGS
 LN_S
@@ -4298,6 +4299,9 @@ WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags
 
 
 
+test "x$GXX" = xyes && NO_WARN_CXXFLAGS='-Wno-write-strings'
+
+
 # Check whether --enable-opi was given.
 if test "${enable_opi+set}" = set; then :
   enableval=$enable_opi; if test "x$enableval" = xyes; then
diff --git a/Build/source/libs/poppler/configure.ac b/Build/source/libs/poppler/configure.ac
index 97ca571d36b..ef9b9b2f4ff 100644
--- a/Build/source/libs/poppler/configure.ac
+++ b/Build/source/libs/poppler/configure.ac
@@ -23,6 +23,9 @@ AC_PROG_LN_S
 
 KPSE_COMPILER_WARNINGS
 
+test "x$GXX" = xyes && NO_WARN_CXXFLAGS='-Wno-write-strings'
+AC_SUBST([NO_WARN_CXXFLAGS])  
+
 dnl ##### Optional features.
 AC_ARG_ENABLE([opi],
               AS_HELP_STRING([--enable-opi],
diff --git a/Build/source/libs/poppler/fofi/Makefile.in b/Build/source/libs/poppler/fofi/Makefile.in
index e754eeeb9aa..aa868da467c 100644
--- a/Build/source/libs/poppler/fofi/Makefile.in
+++ b/Build/source/libs/poppler/fofi/Makefile.in
@@ -85,6 +85,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NO_WARN_CXXFLAGS = @NO_WARN_CXXFLAGS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/Build/source/libs/poppler/goo/Makefile.in b/Build/source/libs/poppler/goo/Makefile.in
index aa0f1acaec6..8c7ebb55f6b 100644
--- a/Build/source/libs/poppler/goo/Makefile.in
+++ b/Build/source/libs/poppler/goo/Makefile.in
@@ -85,6 +85,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NO_WARN_CXXFLAGS = @NO_WARN_CXXFLAGS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/Build/source/libs/poppler/poppler/Makefile.in b/Build/source/libs/poppler/poppler/Makefile.in
index 79b25790077..fa9a540f86c 100644
--- a/Build/source/libs/poppler/poppler/Makefile.in
+++ b/Build/source/libs/poppler/poppler/Makefile.in
@@ -85,6 +85,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NO_WARN_CXXFLAGS = @NO_WARN_CXXFLAGS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog
index e13b47e2cf8..8f92cb13c17 100644
--- a/Build/source/libs/xpdf/ChangeLog
+++ b/Build/source/libs/xpdf/ChangeLog
@@ -1,3 +1,18 @@
+2011-04-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (goo_libGoo_a_sources): Omit parsearg.c.
+
+2011-04-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Suppress "deprecated conversion from string constant to 'char*'"
+	warnings from g++-4.4.
+	Unfortunately xpdf declares lots of function parameters as
+	'char *' that should actually be 'const char *'.
+	Compiling with the g++-4.4 default '-Wwrite-strings' would yield
+	>10000 such warnings.
+
+	* Makefile.am, configure.ac: Define and use NO_WARN_CXXFLAGS.
+
 2009-01-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 64812782098..998eec25728 100644
--- a/Build/source/libs/xpdf/Makefile.am
+++ b/Build/source/libs/xpdf/Makefile.am
@@ -1,6 +1,6 @@
 ## Proxy Makefile.am to build xpdf for TeX Live.
 ##
-##   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -51,6 +51,8 @@ XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf
 
 INCLUDES = -Igoo -Ifofi -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) -I$(XPDF_SRC)
 AM_CPPFLAGS = -DPDF_PARSER_ONLY
+AM_CFLAGS = $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(NO_WARN_CXXFLAGS)
 
 noinst_LIBRARIES = libxpdf.a
 
@@ -66,8 +68,7 @@ goo_libGoo_a_sources = \
 	$(GOO_SRC)/GString.cc \
 	$(GOO_SRC)/gmem.cc \
 	$(GOO_SRC)/gmempp.cc \
-	$(GOO_SRC)/gfile.cc \
-	$(GOO_SRC)/parseargs.c
+	$(GOO_SRC)/gfile.cc
 
 fofi_libfofi_a_sources = \
 	$(FOFI_SRC)/FoFiBase.cc \
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index 6a1342a1812..1f99f0f567d 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -43,7 +43,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \
 	../../build-aux/missing ../../build-aux/texinfo.tex \
 	../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -59,7 +60,7 @@ libxpdf_a_AR = $(AR) $(ARFLAGS)
 libxpdf_a_LIBADD =
 am__objects_1 = FixedPoint.$(OBJEXT) GHash.$(OBJEXT) GList.$(OBJEXT) \
 	GString.$(OBJEXT) gmem.$(OBJEXT) gmempp.$(OBJEXT) \
-	gfile.$(OBJEXT) parseargs.$(OBJEXT)
+	gfile.$(OBJEXT)
 am__objects_2 = FoFiBase.$(OBJEXT) FoFiEncodings.$(OBJEXT) \
 	FoFiTrueType.$(OBJEXT) FoFiType1.$(OBJEXT) \
 	FoFiType1C.$(OBJEXT)
@@ -83,10 +84,6 @@ DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -181,6 +178,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NO_WARN_CXXFLAGS = @NO_WARN_CXXFLAGS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -195,6 +193,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
 XPDF_TREE = @XPDF_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -250,6 +250,8 @@ FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi
 XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf
 INCLUDES = -Igoo -Ifofi -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) -I$(XPDF_SRC)
 AM_CPPFLAGS = -DPDF_PARSER_ONLY
+AM_CFLAGS = $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(NO_WARN_CXXFLAGS)
 noinst_LIBRARIES = libxpdf.a
 nodist_libxpdf_a_SOURCES = \
 	$(goo_libGoo_a_sources) \
@@ -263,8 +265,7 @@ goo_libGoo_a_sources = \
 	$(GOO_SRC)/GString.cc \
 	$(GOO_SRC)/gmem.cc \
 	$(GOO_SRC)/gmempp.cc \
-	$(GOO_SRC)/gfile.cc \
-	$(GOO_SRC)/parseargs.c
+	$(GOO_SRC)/gfile.cc
 
 fofi_libfofi_a_sources = \
 	$(FOFI_SRC)/FoFiBase.cc \
@@ -312,7 +313,7 @@ all: aconf.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .o .obj
+.SUFFIXES: .cc .o .obj
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -423,35 +424,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmempp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parseargs.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@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 $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@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) '$<'`
-
-parseargs.o: $(GOO_SRC)/parseargs.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parseargs.o -MD -MP -MF $(DEPDIR)/parseargs.Tpo -c -o parseargs.o `test -f '$(GOO_SRC)/parseargs.c' || echo '$(srcdir)/'`$(GOO_SRC)/parseargs.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/parseargs.Tpo $(DEPDIR)/parseargs.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(GOO_SRC)/parseargs.c' object='parseargs.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) $(AM_CFLAGS) $(CFLAGS) -c -o parseargs.o `test -f '$(GOO_SRC)/parseargs.c' || echo '$(srcdir)/'`$(GOO_SRC)/parseargs.c
-
-parseargs.obj: $(GOO_SRC)/parseargs.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parseargs.obj -MD -MP -MF $(DEPDIR)/parseargs.Tpo -c -o parseargs.obj `if test -f '$(GOO_SRC)/parseargs.c'; then $(CYGPATH_W) '$(GOO_SRC)/parseargs.c'; else $(CYGPATH_W) '$(srcdir)/$(GOO_SRC)/parseargs.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/parseargs.Tpo $(DEPDIR)/parseargs.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(GOO_SRC)/parseargs.c' object='parseargs.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) $(AM_CFLAGS) $(CFLAGS) -c -o parseargs.obj `if test -f '$(GOO_SRC)/parseargs.c'; then $(CYGPATH_W) '$(GOO_SRC)/parseargs.c'; else $(CYGPATH_W) '$(srcdir)/$(GOO_SRC)/parseargs.c'; fi`
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/Build/source/libs/xpdf/aclocal.m4 b/Build/source/libs/xpdf/aclocal.m4
index 76a153698ad..8cd538d37dc 100644
--- a/Build/source/libs/xpdf/aclocal.m4
+++ b/Build/source/libs/xpdf/aclocal.m4
@@ -989,3 +989,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../../m4/kpse-warnings.m4])
diff --git a/Build/source/libs/xpdf/configure b/Build/source/libs/xpdf/configure
index 069d9ab5083..8b3033207b2 100755
--- a/Build/source/libs/xpdf/configure
+++ b/Build/source/libs/xpdf/configure
@@ -610,6 +610,9 @@ XPDF_TREE
 EGREP
 GREP
 CPP
+NO_WARN_CXXFLAGS
+WARNING_CXXFLAGS
+WARNING_CFLAGS
 LN_S
 RANLIB
 am__fastdepCXX_FALSE
@@ -702,10 +705,11 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
+enable_dependency_tracking
+enable_compiler_warnings
 enable_a4_paper
 enable_opi
 enable_multithreaded
-enable_dependency_tracking
 enable_largefile
 '
       ac_precious_vars='build_alias
@@ -718,9 +722,6 @@ LIBS
 CPPFLAGS
 CXX
 CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
 CCC
 CPP'
 
@@ -1342,12 +1343,15 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-compiler-warnings=[no|min|yes|max|all]
+                          Turn on compiler warnings [default: yes if
+                          maintainer-mode, min otherwise]
   --enable-a4-paper       use A4 paper size instead of Letter for PostScript
                           output
   --enable-opi            include support for OPI comments
   --enable-multithreaded  include support for multithreading
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-largefile     omit support for large files
 
 Some influential environment variables:
@@ -2709,40 +2713,6 @@ fi
 
 
 
-# Check whether --enable-a4-paper was given.
-if test "${enable_a4_paper+set}" = set; then :
-  enableval=$enable_a4_paper; if test "x$enableval" = xyes; then
-
-$as_echo "#define A4_PAPER 1" >>confdefs.h
-
-fi
-
-fi
-
-
-# Check whether --enable-opi was given.
-if test "${enable_opi+set}" = set; then :
-  enableval=$enable_opi; if test "x$enableval" = xyes; then
-
-$as_echo "#define OPI_SUPPORT 1" >>confdefs.h
-
-fi
-
-fi
-
-
-# Check whether --enable-multithreaded was given.
-if test "${enable_multithreaded+set}" = set; then :
-  enableval=$enable_multithreaded; if test "x$enableval" = xyes; then
-
-$as_echo "#define MULTITHREADED 1" >>confdefs.h
-
-fi
-
-fi
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4210,6 +4180,142 @@ $as_echo "no, using $LN_S" >&6; }
 fi
 
 
+# Check whether --enable-compiler-warnings was given.
+if test "${enable_compiler_warnings+set}" = set; then :
+  enableval=$enable_compiler_warnings;
+fi
+case $enable_compiler_warnings in #(
+  no | min | yes | max | all) :
+     ;; #(
+  *) :
+    if test "x$enable_maintainer_mode" = xyes; then :
+  enable_compiler_warnings=yes
+else
+  enable_compiler_warnings=min
+fi ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
+$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+if ${kpse_cv_warning_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
+elif test "x$GCC" = xyes; then
+  kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
+case `$CC -dumpversion` in #(
+  3.4.* | 4.*) :
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
+  *) :
+     ;;
+esac
+case `$CC -dumpversion` in #(
+  3.[234].* | 4.*) :
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
+  *) :
+     ;;
+esac
+if test "x$enable_compiler_warnings" != xmin; then
+  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+  if test "x$enable_compiler_warnings" != xyes; then
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+    case `$CC -dumpversion` in #(
+  3.4.* | 4.*) :
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
+  *) :
+     ;;
+esac
+    if test "x$enable_compiler_warnings" != xmax; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+    fi
+  fi
+fi
+else
+  kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cflags" >&5
+$as_echo "$kpse_cv_warning_cflags" >&6; }
+WARNING_CFLAGS=$kpse_cv_warning_cflags
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5
+$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
+if ${kpse_cv_warning_cxxflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
+elif test "x$GXX" = xyes; then
+  kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
+case `$CXX -dumpversion` in #(
+  3.[234].* | 4.*) :
+    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
+  *) :
+     ;;
+esac
+if test "x$enable_compiler_warnings" != xmin; then
+  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+  if test "x$enable_compiler_warnings" != xyes; then
+    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
+  fi
+    if test "x$enable_compiler_warnings" != xmax; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+    fi
+fi
+else
+  kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cxxflags" >&5
+$as_echo "$kpse_cv_warning_cxxflags" >&6; }
+WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags
+
+
+
+
+
+
+test "x$GXX" = xyes && NO_WARN_CXXFLAGS='-Wno-write-strings'
+
+
+# Check whether --enable-a4-paper was given.
+if test "${enable_a4_paper+set}" = set; then :
+  enableval=$enable_a4_paper; if test "x$enableval" = xyes; then
+
+$as_echo "#define A4_PAPER 1" >>confdefs.h
+
+fi
+
+fi
+
+
+# Check whether --enable-opi was given.
+if test "${enable_opi+set}" = set; then :
+  enableval=$enable_opi; if test "x$enableval" = xyes; then
+
+$as_echo "#define OPI_SUPPORT 1" >>confdefs.h
+
+fi
+
+fi
+
+
+# Check whether --enable-multithreaded was given.
+if test "${enable_multithreaded+set}" = set; then :
+  enableval=$enable_multithreaded; if test "x$enableval" = xyes; then
+
+$as_echo "#define MULTITHREADED 1" >>confdefs.h
+
+fi
+
+fi
+
+
 
 
 ac_ext=c
diff --git a/Build/source/libs/xpdf/configure.ac b/Build/source/libs/xpdf/configure.ac
index ee3e8b4a4ac..26a7c61843b 100644
--- a/Build/source/libs/xpdf/configure.ac
+++ b/Build/source/libs/xpdf/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([xpdf_version], [3.02])[]dnl using unmodified xpdf-3.02 (pl2) source tree
+m4_define([xpdf_version], [3.02])[]dnl using unmodified xpdf source tree
 AC_INIT([xpdf for TeX Live], xpdf_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([xpdf-]xpdf_version[/xpdf/Array.cc])
@@ -16,6 +16,16 @@ AC_CONFIG_MACRO_DIR([../../m4])
 AM_INIT_AUTOMAKE([foreign no-define])
 AM_MAINTAINER_MODE
 
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_RANLIB
+AC_PROG_LN_S
+
+KPSE_COMPILER_WARNINGS
+
+test "x$GXX" = xyes && NO_WARN_CXXFLAGS='-Wno-write-strings'
+AC_SUBST([NO_WARN_CXXFLAGS])  
+
 dnl ##### Optional features.
 AC_ARG_ENABLE([a4-paper],
               AS_HELP_STRING([--enable-a4-paper],
@@ -41,13 +51,6 @@ AC_DEFINE([MULTITHREADED], 1, [Enable multithreading support])
 fi
 ])
 
-dnl **** Check for some programs and libraries ****
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_RANLIB
-AC_PROG_LN_S
-
 dnl **** Checks for header files ****
 
 AC_CHECK_HEADERS([strings.h sys/select.h time.h])
diff --git a/Build/source/libs/xpdf/fofi/Makefile.in b/Build/source/libs/xpdf/fofi/Makefile.in
index 56786fb5381..71537033acb 100644
--- a/Build/source/libs/xpdf/fofi/Makefile.in
+++ b/Build/source/libs/xpdf/fofi/Makefile.in
@@ -35,7 +35,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/hdrs.am
 subdir = fofi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -81,6 +82,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NO_WARN_CXXFLAGS = @NO_WARN_CXXFLAGS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -95,6 +97,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
 XPDF_TREE = @XPDF_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/Build/source/libs/xpdf/goo/Makefile.in b/Build/source/libs/xpdf/goo/Makefile.in
index 43ca3ae6748..485b65c087c 100644
--- a/Build/source/libs/xpdf/goo/Makefile.in
+++ b/Build/source/libs/xpdf/goo/Makefile.in
@@ -35,7 +35,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/hdrs.am
 subdir = goo
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -81,6 +82,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NO_WARN_CXXFLAGS = @NO_WARN_CXXFLAGS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -95,6 +97,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
 XPDF_TREE = @XPDF_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff --git a/Build/source/libs/xpdf/xpdf/Makefile.in b/Build/source/libs/xpdf/xpdf/Makefile.in
index 55f18acf89a..dda05550b4f 100644
--- a/Build/source/libs/xpdf/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/xpdf/Makefile.in
@@ -35,7 +35,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/hdrs.am
 subdir = xpdf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -81,6 +82,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NO_WARN_CXXFLAGS = @NO_WARN_CXXFLAGS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -95,6 +97,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
 XPDF_TREE = @XPDF_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@