diff --git a/configure.ac b/configure.ac
index 5236d26a73a32aeae7f567654bc9c3aeb3ef067f..6bcb1d636c4da05144b6e93b9b7fc87e54a08a92 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])
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 ******************************
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])
+ enable_dbusapi=$enableval,enable_dbusapi=no)
with_dbus="no"
-if test "x$dbusapi" = "xyes"; then
+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=`$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,
Makefile
src/Makefile
src/check-header-compile
-src/application/makefile
src/bind/makefile
src/debug/makefile
src/dialogs/makefile
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}