diff --git a/configure.ac b/configure.ac
index d7c38a7c9d233177db54159b419597644d913a01..7e311a78c06866b9abb01c75e74f5afdef30ab2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -609,9 +609,31 @@ PKG_CHECK_MODULES(POPPLER_GFXFONT, poppler >= 0.8.3, popplernew=yes, popplernew=
if test "x$popplernew" = "xyes"; then
AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Use GfxFont from Poppler >= 0.8.3])
fi
-PKG_CHECK_MODULES(POPPLER_COLORSPACE, poppler >= 0.12.2, popplercolor=yes, popplercolor=no)
+
+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"
+popplercolor="no"
+AC_COMPILE_IFELSE([
+#include <GfxState.h>
+
+int main() {
+ typedef GfxColorSpace *(*parse_p)(Object *, Gfx *);
+ parse_p p;
+ p = &GfxColorSpace::parse;
+ 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)
+else
+ AC_MSG_RESULT(no)
fi
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])
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}