diff --git a/configure.ac b/configure.ac
index 61c34cc258d936bdbf6102914e8cc184ba9899f3..e73e51218cbb8e1a569791f47f944fa0eea18ffe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
# `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])
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])
+with_dbus="no"
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
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(DBUS_LIBS)
- AC_SUBST(DBUS_CFLAGS)
fi
-
+AC_SUBST(DBUS_LIBS)
+AC_SUBST(DBUS_CFLAGS)
AM_CONDITIONAL(WITH_DBUS, test "x$with_dbus" = "xyes")
dnl ******************************
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,