Add virtual to a lot of the destructors. Note: perhaps it will have to be reverted...

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index eabde71b738eb300b52a0eb274f447ec6685d4e4..340b7e4a8a0464c7851d3cab66904a38514f5a32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -84,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 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"
+ALL_LINGUAS="am az be bg bn ca ca@valencia 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)
@@ -280,39 +280,6 @@ if test "x$xft_ok" = "xyes"; then
        fi
 fi
 
-dnl ******************************
-dnl GnomePrint checking
-dnl ******************************
-
-AC_ARG_WITH(gnome-print,
-            AC_HELP_STRING([--with-gnome-print], [use gnome print font database and spooler frontend]),
-            [with_gp=$withval], [with_gp=auto])
-
-if test "x$with_gp" = "xyes"; then
-       dnl Have to test gnome-print presence
-       PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.2 >= 1.116.0  libgnomeprintui-2.2 >= 1.116.0, gp=yes, gp=no)
-       if test "x$gp" != "xyes"; then
-               dnl No gnome-print found
-               if test "x$with_gp" = "xyes"; then
-                       dnl Gnome-print was explicitly asked, so stop
-                       AC_MSG_ERROR([--with-gnome-print was specified, but appropriate libgnomeprint development packages could not be found])
-               else 
-                       # gp is no, tell us for the log file 
-                       AC_MSG_RESULT($gp)
-               fi
-       fi
-else
-       dnl Asked to ignore gnome-print
-       gp=no
-fi
-
-AC_SUBST(GNOME_PRINT_CFLAGS)
-AC_SUBST(GNOME_PRINT_LIBS)
-
-AM_CONDITIONAL(USE_GNOME_PRINT, test "x$gp" = "xyes")
-if test "x$gp" = "xyes"; then
-       AC_DEFINE(WITH_GNOME_PRINT, 1, [Use gnome print font database and spooler frontend])
-fi
 
 dnl ******************************
 dnl gnome vfs checking
@@ -498,6 +465,10 @@ dnl ******************************
 dnl Libpoppler checking
 dnl ******************************
 
+AC_ARG_ENABLE(poppler-cairo,
+       AC_HELP_STRING([--enable-poppler-cairo], [Enable libpoppler-cairo for rendering PDF preview]),
+       [enable_poppler_cairo=$enableval], [enable_poppler_cairo=yes])
+
 POPPLER_CFLAGS=""
 PKG_CHECK_MODULES(POPPLER, poppler >= 0.5.9, poppler=yes, poppler=no)
 
@@ -514,13 +485,16 @@ if test "x$poppler" = "xyes"; then
                        POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib "
                fi
        fi
-       dnl Have to test libpoppler-cairo presence for PDF preview
-       PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.5.9, poppler_cairo=yes, poppler_cairo=no)
-       if test "x$poppler_cairo" = "xyes"; then
-               dnl Working libpoppler-cairo found
-               dnl Check whether the Cairo FreeType backend is available
-               PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, cairo_ft=yes, cairo_ft=no)
-       fi                                                                              
+       if test "x$enable_poppler_cairo" = "xyes"; then
+               dnl Have to test libpoppler-cairo presence for PDF preview
+               dnl AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no)
+               PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.5.9, poppler_cairo=yes, poppler_cairo=no)
+               if test "x$poppler_cairo" = "xyes"; then
+                       dnl Working libpoppler-cairo found
+                       dnl Check whether the Cairo FreeType backend is available
+                       PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, cairo_ft=yes, cairo_ft=no)
+               fi                                                                              
+       fi
 fi
 
 if test "x$poppler" = "xyes"; then
@@ -570,6 +544,19 @@ AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes")
 AC_SUBST(INKBOARD_LIBS)
 AC_SUBST(INKBOARD_CFLAGS)
 
+dnl ******************************
+dnl Check for libwpg for extension
+dnl ******************************
+
+PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
+if test "x$with_libwpg" = "xyes"; then
+       AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
+fi
+AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")
+
+AC_SUBST(LIBWPG_LIBS)
+AC_SUBST(LIBWPG_CFLAGS)
+
 dnl ******************************
 dnl Check for ImageMagick Magick++ 
 dnl ******************************
@@ -962,5 +949,7 @@ Configuration:
         Enable LittleCms:         ${enable_lcms}
         Enable Inkboard:          ${with_inkboard}
         Enable SSL in Inkboard:   ${with_inkboard_ssl}
+        Enable Poppler-Cairo:     ${enable_poppler_cairo}
         ImageMagick Magick++:     ${magick_ok}
+        Libwpg:                   ${with_libwpg}
 "