[Libreoffice-commits] .: Branch 'libreoffice-3-4' - configure.in

[Tomáš Chvátal]

 configure.in |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 72a5f87cb3f0a367f1cd6a5cc15101acc83396fe
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 28 20:40:07 2011 +0000

    make configure check for cpp/poppler-version.h

diff --git a/configure.in b/configure.in
index c5ea30e..3402424 100755
--- a/configure.in
+++ b/configure.in
@@ -6371,6 +6371,16 @@ AS_IF([test "x$enable_ext_pdfimport" = "xyes"], [
       AC_MSG_RESULT([external])
       SYSTEM_POPPLER=YES
       PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
+      AC_LANG_PUSH([C++])
+      save_CXXFLAGS=$CXXFLAGS
+      save_CPPFLAGS=$CPPFLAGS
+      CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+      AC_CHECK_HEADER([cpp/poppler-version.h], [],
+                   [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
+      CXXFLAGS=$save_CXXFLAGS
+      CPPFLAGS=$save_CPPFLAGS
+      AC_LANG_POP([C++])
   else
       AC_MSG_RESULT([internal])
       SYSTEM_POPPLER=NO