X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=bd8eedccc99602f6a68464e3a6e505781d7f0f85;hb=e04817c5fdf1e5673ae1ccc97cdc913fb3734054;hp=0210bd507d0d81cc370a434e220b8d4f1c495d5f;hpb=94f60477a78a3372ef321871523c0739bff29388;p=inkscape.git diff --git a/configure.ac b/configure.ac index 0210bd507..bd8eedccc 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl version is going to be called until about the time we release it dnl (whereas we always know what the previous version was called). AC_CANONICAL_HOST AC_CONFIG_SRCDIR(src/main.cpp) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([dist-zip dist-bzip2 tar-pax]) AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [ prefix=/opt/inkscape @@ -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 br 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@latin 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,20 +485,23 @@ 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_glib" = "xyes" -a "x$poppler_cairo" = "xyes" -a \ + "x$cairo_svg" = "xno" + 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$cairo_ft" = "xyes"; then +if test "x$poppler_cairo" = "xyes" -a "x$poppler_glib" = "xyes"; then AC_DEFINE(HAVE_POPPLER_CAIRO, 1, [Use libpoppler-cairo for rendering PDF preview]) fi if test "x$poppler_glib" = "xyes" -a "x$cairo_svg" = "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 ****************************** @@ -597,7 +584,22 @@ if test $cc_vers_major -gt 3; then else min_sigc_version=2.0.11 fi -PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2) +PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2) + +# Check for Apple Mac OS X Carbon framework +carbon_ok=no +AC_MSG_CHECKING([for Mac OS X Carbon support]) +AC_TRY_CPP([ +#include +#include +], carbon_ok=yes) +AC_MSG_RESULT($carbon_ok) +if test "x$carbon_ok" = "xyes"; then + AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) + CARBON_LDFLAGS="-framework Carbon" + AC_SUBST(CARBON_LDFLAGS) +fi +AM_CONDITIONAL(HAVE_CARBON, test "x$carbon_ok" = "xyes") # Check for some boost header files AC_CHECK_HEADERS([boost/concept_check.hpp], [], AC_MSG_ERROR([You need the boost package (e.g. libboost-dev)])) @@ -607,11 +609,6 @@ if test "x$cairo_pdf" = "xyes"; then AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available]) fi -PKG_CHECK_MODULES(GTK_UNIX_PRINT, gtk+-unix-print-2.0, gtk_unix_print=yes, gtk_unix_print=no) -if test "x$gtk_unix_print" = "xyes"; then - AC_DEFINE(HAVE_GTK_UNIX_PRINT, 1, [Whether the GTK Unix printing backend is available]) -fi - dnl Shouldn't we test for libpng and libz? INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz" @@ -886,6 +883,7 @@ src/helper/makefile src/inkjar/makefile src/io/makefile src/libcroco/makefile +src/libgdl/makefile src/libnr/makefile src/libnrtype/makefile src/libavoid/makefile @@ -915,6 +913,7 @@ share/clipart/Makefile share/examples/Makefile share/extensions/Makefile share/extensions/Barcode/Makefile +share/extensions/xaml2svg/Makefile share/fonts/Makefile share/gradients/Makefile share/icons/Makefile @@ -960,5 +959,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} "