X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=5b66ddc2c82a173f88ee72116c56228912733352;hb=c7cf14ac71346f76ae219ce67fb88c1bd34832e2;hp=3835f620e263e6b054c17889de09ec41d8b64c53;hpb=c94b03b7f9e7496d02296ce711f99dedf98e8d1a;p=inkscape.git

diff --git a/configure.ac b/configure.ac
index 3835f620e..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])
@@ -30,6 +30,7 @@ AM_PROG_CC_STDC
 AM_PROG_AS
 AC_PROG_RANLIB
 AC_PROG_INTLTOOL(0.22)
+AC_PROG_LIBTOOL
 AC_HEADER_STDC
 INK_BZR_SNAPSHOT_BUILD
 
@@ -171,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)
@@ -192,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 ******************************
@@ -610,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>
@@ -626,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)
@@ -636,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 ******************************
@@ -686,6 +709,39 @@ 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 ******************************
+
+AC_ARG_ENABLE(dbusapi,
+       [  --enable-dbusapi       compile with support for DBus interface],
+       enable_dbusapi=$enableval,enable_dbusapi=no)
+
+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
+			DBUSSERVICEDIR="${datadir}/dbus-1/services/"
+		else
+			DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+		fi
+		AC_SUBST(DBUSSERVICEDIR)
+		AC_DEFINE(WITH_DBUS,1,[Build in dbus])
+	fi
+fi
+AC_SUBST(DBUS_LIBS)
+AC_SUBST(DBUS_CFLAGS)
+AM_CONDITIONAL(WITH_DBUS, test "x$with_dbus" = "xyes")
+
 dnl ******************************
 dnl Check for ImageMagick Magick++ 
 dnl ******************************
@@ -745,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,
@@ -922,61 +977,6 @@ dnl
 AC_SUBST(INKSCAPE_CFLAGS)
 AC_SUBST(INKSCAPE_LIBS)
 
-#
-# Checks to see if we should compile in MMX support (there will be
-# a runtime test when the code is actually run to see if it should
-# be used - this just checks if we can compile it.)
-#
-# This code is partially taken from Mesa
-#
-dnl Let people disable the MMX optimization
-AC_ARG_ENABLE(mmx, [  --disable-mmx     Don't use MMX optimization [default=auto]], enable_mmx="$enableval", enable_mmx=auto)
-
-AC_MSG_CHECKING(for x86 platform)
-case $host_cpu in
-  i386|i486|i586|i686|i786|k6|k7)
-    use_x86_asm=yes
-    ;;
-  *)
-    use_x86_asm=no
-esac
-AC_MSG_RESULT($use_x86_asm)
-
-dnl Are we going to use MMX extensions
-use_mmx_asm=no
-
-AC_MSG_CHECKING(compiler support for MMX)
-
-if test x$enable_mmx = xauto ; then
-  if test $use_x86_asm = yes; then
-    save_ac_ext=$ac_ext
-    ac_ext=S
-    
-    cp $srcdir/src/libnr/nr_mmx_R8G8B8A8_P_R8G8B8A8_P_A8_RGBAP.S conftest.S
-    if AC_TRY_EVAL(ac_compile); then
-        use_mmx_asm=yes
-    fi
-    dnl rm -f conftest.[oS]
-
-    ac_ext=$save_ac_ext
-  fi
-
-dnl Enforce usage of MMX extensions
-elif test x$enable_mmx = xyes ; then
-    use_mmx_asm=yes
-else
-    use_mmx_asm=no
-fi
-
-if test $use_mmx_asm = yes; then
-	AC_DEFINE(WITH_MMX, 1, [Use MMX optimizations, if CPU supports it])
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-
-AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
-
 dnl Define our data paths for config.h
 AC_DEFINE_DIR([INKSCAPE_DATADIR], [datadir], [Base data directory])
 AC_DEFINE_DIR([PACKAGE_LOCALE_DIR], [localedir], [Locatization directory])
@@ -985,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
@@ -995,6 +994,7 @@ src/extension/implementation/makefile
 src/extension/internal/makefile
 src/extension/makefile
 src/extension/script/makefile
+src/extension/dbus/wrapper/inkdbus.pc
 src/filters/makefile
 src/helper/makefile
 src/io/makefile
@@ -1076,12 +1076,13 @@ Configuration:
         Use Xft font database:    ${xft_ok}
         Use gnome-vfs:            ${gnome_vfs}
         Use openoffice files:     ${ij}
-        Use MMX optimizations:    ${use_mmx_asm}
         Use relocation support:   ${enable_binreloc}
         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}
 "