diff --git a/configure.ac b/configure.ac
index 340b7e4a8a0464c7851d3cab66904a38514f5a32..9cecae403d548cb7a0d250d4edecf86a63acabbb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
-AC_INIT(inkscape, 0.45+devel)
+AC_INIT(inkscape, 0.46+devel)
dnl N.B. After 0.40, please change to `0.40+cvs' instead of `0.41cvs'.
dnl Rationale: (i) placate simple version comparison software such as
dnl `dpkg --compare-versions'. (ii) We don't always know what the next
dnl N.B. After 0.40, please change to `0.40+cvs' instead of `0.41cvs'.
dnl Rationale: (i) placate simple version comparison software such as
dnl `dpkg --compare-versions'. (ii) We don't always know what the next
dnl (whereas we always know what the previous version was called).
AC_CANONICAL_HOST
AC_CONFIG_SRCDIR(src/main.cpp)
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
AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [
prefix=/opt/inkscape
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
dnl Add the languages which your application supports here.
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 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"
+ALL_LINGUAS="am ar 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)
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
else
dnl Working lcms
fi
else
dnl Working lcms
- LCMS_LIBS="-llcms "
+ LIBS="$LIBS $LCMS_LIBS"
+ AC_DEFINE(ENABLE_LCMS, 1, [Use LittleCms color management])
fi
fi
fi
fi
-if test "x$lcms" = "xyes"; then
- LIBS="$LIBS $LCMS_LIBS"
- AC_DEFINE(ENABLE_LCMS, 1, [Use LittleCms color management])
-fi
-AM_CONDITIONAL(USE_LCMS, test "x$lcms" = "xyes")
AC_SUBST(LCMS_CFLAGS)
AC_SUBST(LCMS_LIBS)
AC_SUBST(LCMS_CFLAGS)
AC_SUBST(LCMS_LIBS)
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)
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
+ 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
fi
fi
LIBS="$LIBS $POPPLER_LIBS"
AC_DEFINE(HAVE_POPPLER, 1, [Use libpoppler for direct PDF import])
fi
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
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
else
min_sigc_version=2.0.11
fi
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 <Carbon/Carbon.h>
+#include <CoreServices/CoreServices.h>
+], 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)]))
# 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)]))
AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available])
fi
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"
dnl Shouldn't we test for libpng and libz?
INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
src/check-header-compile
src/algorithms/makefile
src/application/makefile
src/check-header-compile
src/algorithms/makefile
src/application/makefile
+src/bind/makefile
src/debug/makefile
src/dialogs/makefile
src/display/makefile
src/debug/makefile
src/dialogs/makefile
src/display/makefile
share/clipart/Makefile
share/examples/Makefile
share/extensions/Makefile
share/clipart/Makefile
share/examples/Makefile
share/extensions/Makefile
+share/extensions/alphabet_soup/Makefile
share/extensions/Barcode/Makefile
share/extensions/xaml2svg/Makefile
share/fonts/Makefile
share/extensions/Barcode/Makefile
share/extensions/xaml2svg/Makefile
share/fonts/Makefile