Keeping up with trunk

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c5a7fc444013047053214a0f8b33512f7ddb1b93..5ef78b227db5d37197297a5febf69ba7516c758b 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)
+AC_INIT(inkscape, 0.47+devel)
 
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/main.cpp])
@@ -30,9 +30,13 @@ AM_PROG_CC_STDC
 AM_PROG_AS
 AC_PROG_RANLIB
 AC_PROG_INTLTOOL(0.22)
+AC_PROG_LIBTOOL
 AC_HEADER_STDC
 INK_SVN_SNAPSHOT_BUILD
 
+dnl If automake 1.11 shave the output to look nice
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 dnl These next few lines are needed only while libcroco is in our source tree.
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -616,6 +620,33 @@ 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 ******************************
+
+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`
+       fi
+       AC_SUBST(DBUSSERVICEDIR)
+fi
+AM_CONDITIONAL(WITH_DBUS, test "x$with_dbus" = "xyes")
+
+AC_SUBST(DBUS_LIBS)
+AC_SUBST(DBUS_CFLAGS)
+
 dnl ******************************
 dnl Check for ImageMagick Magick++ 
 dnl ******************************
@@ -968,6 +999,13 @@ share/filters/Makefile
 share/fonts/Makefile
 share/gradients/Makefile
 share/icons/Makefile
+share/icons/application/Makefile
+share/icons/application/16x16/Makefile
+share/icons/application/22x22/Makefile
+share/icons/application/24x24/Makefile
+share/icons/application/32x32/Makefile
+share/icons/application/48x48/Makefile
+share/icons/application/256x256/Makefile
 share/keys/Makefile
 share/markers/Makefile
 share/palettes/Makefile
@@ -1008,7 +1046,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}
 "