![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index c3b9980751a067e0be218e7a23aa62686a3076ce..c5c9952c165fd5a77d9c93e4adf7ad2dae6ce72a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,21 @@ dnl Find msgfmt. Without this, po/Makefile fails to set MSGFMT on some platform
AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+dnl ******************************
+dnl Check for OpenMP
+dnl ******************************
+
+AX_OPENMP([openmp_ok=yes],[openmp_ok=no])
+AC_MSG_CHECKING([for OpenMP support])
+dnl a bit odd, but AX_OPENMP does its own check message, so we're not wrapping it at the moment
+AC_MSG_RESULT([$openmp_ok])
+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)
+fi
+
+
dnl ******************************
dnl Check for libpng
dnl ******************************
break], [gc_ok=no], [$gc_libs])
break],
[gc_ok=no])
-if test "x$gc_ok" = "xyes"; then
+if test "x$gc_ok" = "xyes" && test "x$cross_compiling" = "xno" ; then
AC_MSG_CHECKING([libgc version 6.4+])
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
case "$host" in
*-*-mingw*)
platform_win32=yes
- INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -mms-bitfields -DLIBXML_STATIC"
+ WIN32_CFLAGS="-mms-bitfields -DLIBXML_STATIC"
;;
*)
platform_win32=no
esac
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AC_SUBST(WIN32_CFLAGS)
-AC_MSG_CHECKING([for Solaris 2.8 platform])
+AC_MSG_CHECKING([for Solaris platform])
case "$host" in
- *-solaris2.8)
- platform_solaris_2_8=yes
- CFLAGS="$CFLAGS -DSOLARIS_2_8"
- CXXFLAGS="$CXXFLAGS -DSOLARIS_2_8"
+ *-solaris2.*)
+ platform_solaris=yes
+ solaris_version=`echo $host|sed -e 's/^.*-solaris2\.//' -e s'/\..*$//'`
+ CFLAGS="$CFLAGS -DSOLARIS=$solaris_version"
+ CXXFLAGS="$CXXFLAGS -DSOLARIS=$solaris_version"
;;
*)
- platform_solaris_2_8=no
+ platform_solaris=no
;;
esac
-AC_MSG_RESULT([$platform_solaris_2_8])
-AM_CONDITIONAL(PLATFORM_SOLARIS_2_8, test "$platform_solaris_2_8" = "yes")
+AC_MSG_RESULT([$platform_solaris])
+AM_CONDITIONAL(PLATFORM_SOLARIS, test "$platform_solaris" = "yes")
dnl ******************************
dnl Xft checking
if test "x$with_xft" != "xno" ; then
dnl Test fontconfig package
- PKG_CHECK_MODULES(XFT, xft, xft_ok=yes, xft_ok=no)
+ PKG_CHECK_MODULES(XFT, fontconfig, xft_ok=yes, xft_ok=no)
if test "x$xft_ok" != "xyes"; then
dnl test xft package
- PKG_CHECK_MODULES(XFT, fontconfig, xft_ok=yes, xft_ok=no)
+ PKG_CHECK_MODULES(XFT, xft, xft_ok=yes, xft_ok=no)
if test "x$xft_ok" != "xyes"; then
dnl Have to test xft presence
AC_CHECK_HEADER(X11/Xft/Xft.h, xft_ok=yes, xft_ok=no)
AC_SUBST(POPPLER_CFLAGS)
AC_SUBST(POPPLER_LIBS)
+PKG_CHECK_MODULES(POPPLERNEW, poppler >= 0.8.3, popplernew=yes, popplernew=no)
+if test "x$popplernew" = "xyes"; then
+ AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Poppler version of GfxFont to use (0.8.3 or higher versions of Poppler)])
+fi
+
dnl ******************************
dnl Inkboard dependency checking
dnl ******************************
AC_SUBST(IMAGEMAGICK_LIBS)
AC_SUBST(IMAGEMAGICK_CFLAGS)
+dnl ***********************************************************************************************************
+dnl Check for a Cairo version that implements user-fonts feature (with a stable API, that is cairo > 1.7.6),
+dnl so that we conditionally add SVGFonts support
+dnl ***********************************************************************************************************
+
+PKG_CHECK_MODULES(CAIRO_USER_FONTS, cairo > 1.7.6, cairouserfonts=yes, cairouserfonts=no)
+if test "x$cairouserfonts" = "xyes"; then
+ AC_DEFINE(ENABLE_SVG_FONTS, 1, [SVG Fonts should be used])
+fi
+
dnl ******************************
dnl Unconditional dependencies
dnl ******************************
fi
dnl Shouldn't we test for libpng and libz?
-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+if test "x$openmp_ok" = "xyes"; then
+ INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lgomp"
+else
+ INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+fi
AC_CHECK_HEADER(popt.h,
[INKSCAPE_LIBS="$INKSCAPE_LIBS -lpopt"],
# Add even more stuff
CXXFLAGS="-Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS"
- ## This is evil!
- CXXFLAGS=""
- CFLAGS=""
-
dnl Test for arch-specific situations.
case "$host_cpu" in
mips|mipsel)
AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
-dnl Figure out where the datadir actually is
-dnl http://autoconf-archive.cryp.to/ac_define_dir.html
-prefix_NONE=
-exec_prefix_NONE=
-test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}. Thus we have to use `eval' twice.
-eval runtime_datadir="${datadir}"
-eval runtime_datadir="${runtime_datadir}"
-test "$prefix_NONE" && prefix=NONE
-test "$exec_prefix_NONE" && exec_prefix=NONE
-
-inkscape_sharedir="${runtime_datadir}/${PACKAGE_NAME}"
-
dnl Define our data paths for config.h
-AC_SUBST(INKSCAPE_DATADIR)
-AC_DEFINE_UNQUOTED([INKSCAPE_DATADIR], "${runtime_datadir}",
- [Base data directory -- only path-prefix.h should use it!])
-AC_SUBST(PACKAGE_LOCALE_DIR)
-AC_DEFINE_UNQUOTED([PACKAGE_LOCALE_DIR], "${runtime_datadir}/locale",
- [Localization directory])
-AC_SUBST(INKSCAPE_LIBDIR)
-AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "${prefix}/lib",
- [Base library directory -- only path-prefix.h should use it!])
-
-dnl Have to add module makefiles (lauris)
+AC_DEFINE_DIR([INKSCAPE_DATADIR], [datadir], [Base data directory])
+AC_DEFINE_DIR([PACKAGE_LOCALE_DIR], [localedir], [Locatization directory])
AC_CONFIG_FILES([
Makefile
src/extension/internal/makefile
src/extension/makefile
src/extension/script/makefile
+src/filters/makefile
src/helper/makefile
src/inkjar/makefile
src/io/makefile
src/ui/makefile
src/ui/view/makefile
src/ui/widget/makefile
-src/utest/makefile
src/util/makefile
src/widgets/makefile
src/xml/makefile
share/extensions/Makefile
share/extensions/alphabet_soup/Makefile
share/extensions/Barcode/Makefile
+share/extensions/Poly3DObjects/Makefile
share/extensions/xaml2svg/Makefile
+share/filters/Makefile
share/fonts/Makefile
share/gradients/Makefile
share/icons/Makefile
+share/icons/hicolor/Makefile
+share/icons/hicolor/scalable/Makefile
+share/icons/hicolor/scalable/actions/Makefile
+share/icons/hicolor/scalable/devices/Makefile
+share/icons/hicolor/scalable/places/Makefile
+share/icons/hicolor/scalable/status/Makefile
share/keys/Makefile
share/markers/Makefile
share/palettes/Makefile