diff options
| author | Ted Gould <ted@gould.cx> | 2010-05-15 18:20:53 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-05-15 18:20:53 +0000 |
| commit | 0a63bd1f23b49de16a693d8b01b9b419e95b7ecf (patch) | |
| tree | f5487cfc0d091026f1b3b707ecd3ee5206fc6690 | |
| parent | Updating to trunk (diff) | |
| download | inkscape-0a63bd1f23b49de16a693d8b01b9b419e95b7ecf.tar.gz inkscape-0a63bd1f23b49de16a693d8b01b9b419e95b7ecf.zip | |
Making an enable/disable flag for building with dbus
(bzr r8254.1.55)
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index a5891b4a2..3e0408b15 100644 --- a/configure.ac +++ b/configure.ac @@ -699,20 +699,27 @@ 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=yes) +AC_DEFINE(WITH_DBUS,1,[Build in dbus]) + +if test "x$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) fi - AC_SUBST(DBUSSERVICEDIR) + + AC_SUBST(DBUS_LIBS) + AC_SUBST(DBUS_CFLAGS) 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++ |