X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=5b66ddc2c82a173f88ee72116c56228912733352;hb=c980cfbcfff398f6c5eeba39f65d8df29f8c6256;hp=3e0408b1550a96dc81b1d65336a6fc0b3aa0fe40;hpb=5ae8b524dbcef416fa159c34253484c9fe9ca1e8;p=inkscape.git

diff --git a/configure.ac b/configure.ac
index 3e0408b15..5b66ddc2c 100644
--- 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])
@@ -172,7 +172,7 @@ GETTEXT_PACKAGE="AC_PACKAGE_NAME"
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi fr ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv th tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi fr ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv te_IN th tr uk vi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -193,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 ******************************
@@ -611,11 +612,12 @@ if test "x$popplernew" = "xyes"; then
 	AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Use GfxFont from Poppler >= 0.8.3])
 fi
 
-AC_MSG_CHECKING(for new color space API in Poppler)
 ink_svd_CPPFLAGS=$CPPFLAGS
 ink_svd_LIBS=$LIBS
 CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
 LIBS="$LIBS $POPPLER_LIBS"
+
+AC_MSG_CHECKING(for new color space API in Poppler)
 popplercolor="no"
 AC_COMPILE_IFELSE([
 #include <GfxState.h>
@@ -627,9 +629,6 @@ int main() {
   return 0;
 }
 ], [popplercolor=yes])
-CPPFLAGS=$ink_svd_CPPFLAGS
-LIBS=$ink_svd_LIBS
-
 if test "x$popplercolor" = "xyes"; then
 	AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
 	AC_MSG_RESULT(yes)
@@ -637,6 +636,29 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+# Poppler's b604a008 commit changes this
+AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
+popplergfxcolor="no"
+AC_COMPILE_IFELSE([
+#include <GfxState.h>
+
+int main() {
+  GfxPatch::ColorValue color = {c: {0}};
+  GfxPatch patch;
+  patch.color[[0]][[0]] = color;
+  return 0;
+}
+], [popplergfxcolor=yes])
+if test "x$popplergfxcolor" = "xyes"; then
+	AC_DEFINE(POPPLER_NEW_GFXPATCH, 1, [GfxPatch no longer uses GfxColor in >= 0.15.1])
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
+
+CPPFLAGS=$ink_svd_CPPFLAGS
+LIBS=$ink_svd_LIBS
+
 dnl ******************************
 dnl Inkboard dependency checking
 dnl ******************************
@@ -701,10 +723,10 @@ 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)
 
-if test "x$dbusapi" = "xyes"; then
+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
@@ -713,12 +735,11 @@ if test "x$dbusapi" = "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 ******************************
@@ -780,10 +801,9 @@ if test "x$cairo_pdf" = "xyes"; then
 fi
 
 dnl Shouldn't we test for libpng and libz?
+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2 -ldl"
 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,
@@ -965,7 +985,6 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/check-header-compile
-src/application/makefile
 src/bind/makefile
 src/debug/makefile
 src/dialogs/makefile
@@ -1061,7 +1080,7 @@ Configuration:
         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}