These files were separated out from filedialog.cpp and filedialog.h, so to facilitate...

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 346c1d35b2a7827c9040362f02dd463120ed2555..47466a30a03d727a0647d22ceda0543dcbbb71b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,16 +33,18 @@ AC_HEADER_STDC
 dnl These next few lines are needed only while libcroco is in our source tree.
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_MSG_NOTICE([Testing -Wno-pointer-sign])
 if test "$GCC" = "yes"; then
   # Enable some warnings from gcc.
 
+  AC_LANG_PUSH(C)
   # -Wno-pointer-sign is probably new in gcc 4.0; certainly it isn't accepted
   # by gcc 2.95.
   ink_svd_CFLAGS="$CFLAGS"
   CFLAGS="-Wno-pointer-sign $CFLAGS"
-  AC_COMPILE_IFELSE([int dummy;
-], , CFLAGS="$ink_svd_CFLAGS",)
+  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), AC_MSG_NOTICE([ compiler supports -Wno-pointer-sign]), CFLAGS="$ink_svd_CFLAGS")
   CFLAGS="-Wall -Wformat-security -W -D_FORTIFY_SOURCE=2 $CFLAGS"
+  AC_LANG_POP
 fi
 
 dnl Honor aclocal flags
@@ -82,7 +84,7 @@ GETTEXT_PACKAGE="AC_PACKAGE_NAME"
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="am az be bg bn ca cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fi fr ga gl hr hu id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@Latn sr sv th tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am az be bg bn ca cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fi fr ga gl he hr hu id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@Latn sr sv th tr uk vi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -90,6 +92,10 @@ if test "x$PKG_CONFIG" = "xno"; then
        AC_MSG_ERROR(You have to install pkg-config to compile inkscape.)
 fi
 
+dnl Find msgfmt.  Without this, po/Makefile fails to set MSGFMT on some platforms.
+AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
 dnl ******************************
 dnl Check for libpng 
 dnl ******************************
@@ -488,6 +494,38 @@ AM_CONDITIONAL(USE_LCMS, test "x$lcms" = "xyes")
 AC_SUBST(LCMS_CFLAGS)
 AC_SUBST(LCMS_LIBS)
 
+dnl ******************************
+dnl Libpoppler checking
+dnl ******************************
+
+POPPLER_CFLAGS=""
+PKG_CHECK_MODULES(POPPLER, poppler >= 0.5.5, poppler=yes, poppler=no)
+
+if test "x$poppler" = "xyes"; then
+       dnl Working libpoppler
+       POPPLER_LIBS="-lpoppler "
+       dnl Have to test libpoppler-glib presence
+       PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.5.5, poppler_glib=yes, poppler_glib=no)
+       if test "x$poppler_glib" = "xyes"; then
+               dnl Working libpoppler-glib found
+               dnl Check whether the Cairo SVG backend is available
+               PKG_CHECK_MODULES(CAIRO_SVG, cairo-svg, cairo_svg=yes, cairo_svg=no)
+               if test "x$cairo_svg" = "xyes"; then
+                       POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib "
+               fi
+       fi
+fi
+
+if test "x$poppler" = "xyes"; then
+       LIBS="$LIBS $POPPLER_LIBS"
+       AC_DEFINE(HAVE_POPPLER, 1, [Use libpoppler for direct PDF import])
+fi
+if test "x$poppler_glib" = "xyes" -a "x$cairo_svg" = "xyes"; then
+       AC_DEFINE(HAVE_POPPLER_GLIB, 1, [Use libpoppler-glib and Cairo-SVG for PDF import])
+fi
+AC_SUBST(POPPLER_CFLAGS)
+AC_SUBST(POPPLER_LIBS)
+
 dnl ******************************
 dnl Inkboard dependency checking
 dnl ******************************
@@ -843,6 +881,7 @@ share/Makefile
 share/clipart/Makefile
 share/examples/Makefile
 share/extensions/Makefile
+share/extensions/Barcode/Makefile
 share/fonts/Makefile
 share/gradients/Makefile
 share/icons/Makefile