From 548b61a2a022adb7ebf818410c088328b598a021 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 21 Feb 2012 06:58:02 +0100
Subject: fix build with internal xpdf

---
 RepositoryExternal.mk | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'RepositoryExternal.mk')

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e369ff4cc5d6..1a054c742223 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1080,15 +1080,34 @@ endef
 
 else # !SYSTEM_POPPLER
 
-# FIXME: what are the libs created by xpdf?
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	poppler \
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+	fofi \
+	Goo \
+	xpdf \
 ))
 
 define gb_LinkTarget__use_poppler
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(OUTDIR)/inc/xpdf \
+	$$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	fofi \
+	Goo \
+	xpdf \
+)
+
+ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	poppler \
+	objc \
 )
+else ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	advapi32 \
+	gdi32 \
+)
+endif
 
 endef
 
-- 
cgit