diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-11-13 10:27:21 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-11-13 10:28:15 +0200 |
commit | 97d8b882210c5a7f3bf6b3d53bfef1fb9a487acf (patch) | |
tree | 9ca1404bdfc4fb13339d57ff3db39e369b7c9f9d /configure.ac | |
parent | 39f9eb0d856293a974e2f024b29dca20068af073 (diff) |
Revert "fdo#38878 upgrade xpdf to poppler"
Also revert my two minor follow-up popper commits.
Poppler doesn't build on Mac OS X. It uses fontconfig, and we don't
depend on that on the Mac.
There is a patch from 2009
http://lists.freedesktop.org/archives/poppler/2009-July/004932.html
(actual patch at
http://lists.freedesktop.org/archives/poppler/attachments/20090712/f3b154d0/attachment-0001.obj
) that makes poppler not use fontconfig on the Mac, but it was never
upstreamed.
And that patch uses the obsolete ATSUI API, which we want to stop
using in LO code, not introduce new uses of.
This reverts commit 39f9eb0d856293a974e2f024b29dca20068af073.
This reverts commit 0941c211858416f6117548e093b428b64785f98a.
This reverts commit a6e9bb4c7bad649cb44efaeef67fa18090348c53.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 03cfc3ad8d3c..35727c02adae 100644 --- a/configure.ac +++ b/configure.ac @@ -9834,8 +9834,8 @@ if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" != else AC_MSG_RESULT([internal]) SYSTEM_POPPLER=NO - POPPLER_TARBALL="8a80ae83eb7a327b031808d09ee1d54d-poppler-0.20.5.tar.gz" - BUILD_TYPE="$BUILD_TYPE POPPLER" + XPDF_TARBALL="599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz" + BUILD_TYPE="$BUILD_TYPE XPDF" fi else AC_MSG_RESULT([no]) @@ -9846,7 +9846,7 @@ AC_SUBST(ENABLE_PDFIMPORT) AC_SUBST(SYSTEM_POPPLER) AC_SUBST(POPPLER_CFLAGS) AC_SUBST(POPPLER_LIBS) -AC_SUBST(POPPLER_TARBALL) +AC_SUBST(XPDF_TARBALL) if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then @@ -11420,7 +11420,7 @@ dnl Test whether to build cairo or rely on the system version dnl =================================================================== -SYSTEM_CAIRO="NO" +SYSTEM_CAIRO="" if test "$test_cairo" = "yes" ; then AC_MSG_CHECKING([whether to use the system cairo]) |