Fix compile breakage.

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0fdac33ff779e4ad9c12174ab401851be7a609df..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])
@@ -30,6 +30,7 @@ AM_PROG_CC_STDC
 AM_PROG_AS
 AC_PROG_RANLIB
 AC_PROG_INTLTOOL(0.22)
+AC_PROG_LIBTOOL
 AC_HEADER_STDC
 INK_BZR_SNAPSHOT_BUILD
 
@@ -192,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 ******************************
@@ -686,6 +688,39 @@ AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")
 AC_SUBST(LIBWPG_LIBS)
 AC_SUBST(LIBWPG_CFLAGS)
 
+dnl ******************************
+dnl Support doing a local install
+dnl   (mostly for distcheck)
+dnl ******************************
+
+with_localinstall="no"
+AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install system files in the local path (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
+
+dnl ******************************
+dnl Check for dbus functionality
+dnl ******************************
+
+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
+fi
+AC_SUBST(DBUS_LIBS)
+AC_SUBST(DBUS_CFLAGS)
+AM_CONDITIONAL(WITH_DBUS, test "x$with_dbus" = "xyes")
+
 dnl ******************************
 dnl Check for ImageMagick Magick++ 
 dnl ******************************
@@ -929,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
@@ -939,6 +973,7 @@ src/extension/implementation/makefile
 src/extension/internal/makefile
 src/extension/makefile
 src/extension/script/makefile
+src/extension/dbus/wrapper/inkdbus.pc
 src/filters/makefile
 src/helper/makefile
 src/io/makefile
@@ -1024,7 +1059,9 @@ Configuration:
         Internal Python:          ${with_python}
         Internal Perl:            ${with_perl}
         Enable LittleCms:         ${enable_lcms}
+        Enable DBUS:              ${with_dbus} 
         Enable Poppler-Cairo:     ${enable_poppler_cairo}
         ImageMagick Magick++:     ${magick_ok}
         Libwpg:                   ${with_libwpg}
+        Doing Local Install:      ${with_localinstall}
 "