From: ishmal <ishmal@users.sourceforge.net>
Date: Sun, 19 Aug 2007 21:09:05 +0000 (+0000)
Subject: Add libpoppler-cairo, and correct the link order
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4f2fd333d65e75944e9314953c8e467f656cca51;p=inkscape.git

Add libpoppler-cairo, and correct the link order
---

diff --git a/build.xml b/build.xml
index 342e2b27d..8280b3230 100644
--- a/build.xml
+++ b/build.xml
@@ -145,7 +145,8 @@
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
-        
+        #define HAVE_POPPLER_CAIRO            1
+
         /* do we want bitmap manipulation? */
         #define WITH_IMAGE_MAGICK             1
 
@@ -371,13 +372,14 @@
            -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
            -lgdk_pixbuf-2.0
            -lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
-           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo.dll
+           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0
            <!-- PERL -->
            -L${gtk}/perl/lib/CORE -lperl58
            <!-- PYTHON -->
            -L${gtk}/python/libs -lpython25
            ${gtk}/bin/libxml2.dll
-           -lpoppler
+           -lpoppler-cairo -lpoppler
+           -lcairo.dll
            ${gtk}/lib/iconv.lib
            -lfreetype.dll -lfontconfig.dll
            -lssl -lcrypto