applied external xpdf patch from Patrice Dumas

diff --git a/config.h.in b/config.h.in
index 39a686a..602294d 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -146,6 +146,15 @@
 /* Define if OpenGL seems to work */
 #undef HAVE_OPENGL
 
+/* Define if you use poppler */
+#undef HAVE_POPPLER
+
+/* Define to 1 if you have the `poppler' library (-lpoppler). */
+#undef HAVE_LIBPOPPLER
+
+/* Define to 1 if you have the <OutputDev.h> header file. */
+#undef HAVE_OUTPUTDEV_H
+
 /* Define if you have the jpeg library (-ljpeg).  */
 /* Define if you have the jpeg library (-ljpeg).  */
 #undef HAVE_LIBJPEG
@@ -238,5 +247,9 @@
 #endif
 #endif
 
+#ifdef HAVE_POPPLER
+#define GString GooString
+#define GHash GooHash
+#endif
 
 #endif

diff --git a/configure.in b/configure.in
index e39a0d7..c4391df 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,10 +20,12 @@ AC_ARG_ENABLE(optimizations,
 AC_ARG_ENABLE(lame,
 [  --disable-lame          don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true)
 AC_ARG_WITH([external-libart],
-[  --with-external-libart  use external libart library (at your own risk)], [EXTERNAL_LIBART=true])
+[  --with-external-libart  use external libart library (currently broken)], [EXTERNAL_LIBART=true])
+AC_ARG_WITH([poppler],
+[  --with-poppler          use poppler instead of internal xpdf (currently broken)], [USE_POPPLER=true])
 
 PACKAGE=swftools
-VERSION=2008-06-23-2005
+VERSION=2008-07-11-0020
 
 
 # ------------------------------------------------------------------
@@ -135,6 +137,8 @@ fi
  AC_PROG_LN_S
  AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
 
+PKG_PROG_PKG_CONFIG
+
 dnl Checks for system services
 OBJEXT="o"
 AREXT=".a"
@@ -314,6 +318,29 @@ if test "x$EXTERNAL_LIBART" = "xtrue"; then
 fi
 AC_SUBST([art_in_source])
 
+xpdf_in_source='$(xpdf_objects)'
+splash_in_source='$(splash_objects)'
+
+if test "x$USE_POPPLER" = "xtrue"; then
+    xpdf_in_source=
+    splash_in_source=
+    AC_DEFINE([HAVE_POPPLER],[1],[use poppler])
+    PKG_CHECK_MODULES([POPPLER],[poppler poppler-splash],,[poppler_pkgconfig=no])
+    if test "x$poppler_pkgconfig" = "xno"; then
+        AC_LANG_PUSH([C++])
+        AC_CHECK_HEADERS([OutputDev.h],[
+           AC_CHECK_LIB([poppler],[main],,[])
+        ],[AC_MSG_ERROR([No poppler library found. This library is required.])])
+        AC_LANG_POP
+    else
+       CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+        AC_DEFINE([HAVE_POPPLER], [1])
+        LIBS="$LIBS $POPPLER_LIBS"
+    fi
+fi
+AC_SUBST([xpdf_in_source])
+AC_SUBST([splash_in_source])
+
 # ------------------------------------------------------------------
  
 RFX_CHECK_AVI2SWF
@@ -509,6 +536,10 @@ AH_BOTTOM([
 #endif // __config_h__
 ])
 
+#ifdef HAVE_POPPLER
+#define GString GooString
+#define GHash GooHash
+#endif
 
 
 if test -f "release.in"; then release_in="./release"; fi