2 files changed, 15 insertions, 5 deletions

diff --git a/Build/source/libs/xpdf/goo/Makefile.in b/Build/source/libs/xpdf/goo/Makefile.in
index fdfc82b9a9c..4de9c5d7fda 100644
--- a/Build/source/libs/xpdf/goo/Makefile.in
+++ b/Build/source/libs/xpdf/goo/Makefile.in
@@ -10,9 +10,14 @@
 
 # ------------------------------------------------------------------------
 # Changed by Martin Schröder <martin@pdftex.org>
-# $Id: Makefile.in 421 2008-04-26 21:59:55Z oneiros $
+# $Id: Makefile.in 494 2008-07-14 21:35:09Z oneiros $
 # Changelog:
 # ------------------------------------------------------------------------
+# r493 | oneiros | 2008-07-14 23:32:04 +0200 (Mo, 14 Jul 2008) | 2 lines
+#
+# Also set -DDISABLE_OUTLINE (pdftoepdf.cc had conflicting options)
+#
+# ------------------------------------------------------------------------
 # r390 | oneiros | 2008-03-23 16:51:58 +0100 (So, 23 Mär 2008) | 2 lines
 #
 # Merge changes since r357 to everything but pdftexdir from trunk into stable
@@ -73,7 +78,7 @@ kpathsea_include_dir = -I../../../texk -I$(srcdir)/../../../texk
 ALLCFLAGS = $(CFLAGS) @DEFS@ -I.. -I$(srcdir)/.. -I. -I$(srcdir) $(kpathsea_include_dir)
 ALLCXXFLAGS = $(CXXFLAGS) @DEFS@ \
   -I.. -I$(srcdir)/.. -I. -I$(srcdir) $(kpathsea_include_dir) \
-  -DPDF_PARSER_ONLY
+  -DPDF_PARSER_ONLY -DDISABLE_OUTLINE
 CXXFLAGS = @CXXFLAGS@
 CC = @CC@
 CXX = @CXX@
diff --git a/Build/source/libs/xpdf/xpdf/Makefile.in b/Build/source/libs/xpdf/xpdf/Makefile.in
index 52da94bb852..27fe1538cae 100644
--- a/Build/source/libs/xpdf/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/xpdf/Makefile.in
@@ -8,14 +8,19 @@
 #
 # Heavily modified for pdftex by Thomas Esser, 1998, 1999
 #
-# $Id: Makefile.in 421 2008-04-26 21:59:55Z oneiros $
+# $Id: Makefile.in 494 2008-07-14 21:35:09Z oneiros $
 #========================================================================
 
 # ------------------------------------------------------------------------
 # Changed by Martin Schröder <martin@pdftex.org>
-# $Id: Makefile.in 421 2008-04-26 21:59:55Z oneiros $
+# $Id: Makefile.in 494 2008-07-14 21:35:09Z oneiros $
 # Changelog:
 # ------------------------------------------------------------------------
+# r493 | oneiros | 2008-07-14 23:32:04 +0200 (Mo, 14 Jul 2008) | 2 lines
+#
+# Also set -DDISABLE_OUTLINE (pdftoepdf.cc had conflicting options)
+#
+# ------------------------------------------------------------------------
 # r390 | oneiros | 2008-03-23 16:51:58 +0100 (So, 23 Mär 2008) | 2 lines
 # 
 # Merge changes since r357 to everything but pdftexdir from trunk into stable
@@ -72,7 +77,7 @@ CXXFLAGS = @CXXFLAGS@
 CXX = @CXX@
 ALLCXXFLAGS = $(CXXFLAGS) -DHAVE_CONFIG_H $(XCFLAGS) \
   -I.. -I$(srcdirparent) -I$(goodir) -I$(fofidir) -I. -I$(srcdir) \
-  -DPDF_PARSER_ONLY
+  -DPDF_PARSER_ONLY -DDISABLE_OUTLINE
 
 kpse_include ../../texk/make/library.mk