Sorry, I got off on a branch and ended up with a bunch of things. I'm just going...

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 46f255abbcd22c5ab7472963bdb0ec9f30442e33..5a77262410bfc34329ee61d5b965312162437eb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -551,11 +551,10 @@ fi
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
 
-ink_svd_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$POPPLER_CFLAGS $CPPFLAGS"
-AC_MSG_CHECKING([whether libpoppler has new getNextChar])
-AC_EGREP_CPP([Unicode ..u. int .uLen], [#include "GfxFont.h"], AC_DEFINE([POPPLER_NEW_GFXFONT], [], [True iff libpoppler is 0.8.3 or newer.]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-CPPFLAGS="$ink_svd_CPPFLAGS"
+PKG_CHECK_MODULES(POPPLERNEW, poppler >= 0.8.3, popplernew=yes, popplernew=no)
+if test "x$popplernew" = "xyes"; then
+       AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Poppler version of GfxFont to use (0.8.3 or higher versions of Poppler)])
+fi
 
 dnl ******************************
 dnl Inkboard dependency checking