New Dutch calligraphy and interpolate tutorial

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a5891b4a27089014405a6ff131c4d36f59dd29d2..6bcb1d636c4da05144b6e93b9b7fc87e54a08a92 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
 # `dpkg --compare-versions'.  (ii) We don't always know what the next
 # version is going to be called until about the time we release it
 # (whereas we always know what the previous version was called).
-AC_INIT(inkscape, 0.47+devel)
+AC_INIT(inkscape, 0.48+devel)
 
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/main.cpp])
@@ -172,7 +172,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 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 fa fi fr ga gl he hr hu hy 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"
+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 fa fi fr ga gl he hr hu hy 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 te_IN th tr uk vi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -193,6 +193,7 @@ if test "x$openmp_ok" = "xyes"; then
        dnl We have it, now set up the flags
        CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
        AC_CHECK_HEADER(omp.h)
+       AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
 fi
 
 dnl ******************************
@@ -699,20 +700,26 @@ dnl ******************************
 dnl Check for dbus functionality
 dnl ******************************
 
-PKG_CHECK_MODULES(DBUS, dbus-glib-1, with_dbus=yes, with_dbus=no)
-if test "x$with_dbus" = "xyes"; then
-       AC_DEFINE(WITH_DBUS,1,[Build in dbus])
-       if test "x$with_localinstall" = "xyes"; then
-               DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-       else
-               DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+AC_ARG_ENABLE(dbusapi,
+       [  --enable-dbusapi       compile with support for DBus interface],
+       enable_dbusapi=$enableval,enable_dbusapi=no)
+
+with_dbus="no"
+if test "x$enable_dbusapi" = "xyes"; then
+       PKG_CHECK_MODULES(DBUS, dbus-glib-1, with_dbus=yes, with_dbus=no)
+       if test "x$with_dbus" = "xyes"; then
+               if test "x$with_localinstall" = "xyes"; then
+                       DBUSSERVICEDIR="${datadir}/dbus-1/services/"
+               else
+                       DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+               fi
+               AC_SUBST(DBUSSERVICEDIR)
+               AC_DEFINE(WITH_DBUS,1,[Build in dbus])
        fi
-       AC_SUBST(DBUSSERVICEDIR)
 fi
-AM_CONDITIONAL(WITH_DBUS, test "x$with_dbus" = "xyes")
-
 AC_SUBST(DBUS_LIBS)
 AC_SUBST(DBUS_CFLAGS)
+AM_CONDITIONAL(WITH_DBUS, test "x$with_dbus" = "xyes")
 
 dnl ******************************
 dnl Check for ImageMagick Magick++ 
@@ -773,10 +780,9 @@ if test "x$cairo_pdf" = "xyes"; then
 fi
 
 dnl Shouldn't we test for libpng and libz?
+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2"
 if test "x$openmp_ok" = "xyes"; then
-       INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lgomp"
-else
-       INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+       INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
 fi
 
 AC_CHECK_HEADER(popt.h,
@@ -958,7 +964,6 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/check-header-compile
-src/application/makefile
 src/bind/makefile
 src/debug/makefile
 src/dialogs/makefile
@@ -1054,7 +1059,7 @@ Configuration:
         Internal Python:          ${with_python}
         Internal Perl:            ${with_perl}
         Enable LittleCms:         ${enable_lcms}
-        Enable DBUS               ${with_dbus} 
+        Enable DBUS:              ${with_dbus} 
         Enable Poppler-Cairo:     ${enable_poppler_cairo}
         ImageMagick Magick++:     ${magick_ok}
         Libwpg:                   ${with_libwpg}