X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=d7c38a7c9d233177db54159b419597644d913a01;hb=99f8079bc0a32aef279e4af06de4cbf4bd853563;hp=32990943b03eeb6eecf5ebebd97a0ddf76f80774;hpb=69224ec478cfd43c9ec8980e9d8984ee4291c39b;p=inkscape.git diff --git a/configure.ac b/configure.ac index 32990943b..d7c38a7c9 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ AM_PROG_AS AC_PROG_RANLIB AC_PROG_INTLTOOL(0.22) AC_HEADER_STDC -INK_SVN_SNAPSHOT_BUILD +INK_BZR_SNAPSHOT_BUILD dnl If automake 1.11 shave the output to look nice m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -125,6 +125,45 @@ if test "x$GXX" = "xyes"; then fi fi +# Detect a working version of unordered containers. +AC_MSG_CHECKING([TR1 unordered_set usability]) +AC_COMPILE_IFELSE([ +#include +int main() { + std::tr1::unordered_set i, j; + i = j; + return 0; +} +], [unordered_set_works=yes], [unordered_set_works=no]) +if test "x$unordered_set_works" = "xyes"; then + AC_MSG_RESULT([ok]) + AC_DEFINE(HAVE_TR1_UNORDERED_SET, 1, [Has working standard TR1 unordered_set]) +else + AC_MSG_RESULT([not working]) +fi +AC_CHECK_HEADER([boost/unordered_set.hpp], [AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1, [Boost unordered_set (Boost >= 1.36)])], []) +AC_CHECK_HEADER([ext/hash_set], [AC_DEFINE(HAVE_EXT_HASH_SET, 1, [Legacy GNU ext/hash_set])], []) + +# Test whether GCC emits a spurious warning when using boost::optional +# If yes, turn off strict aliasing warnings to reduce noise +# and allow the legitimate warnings to stand out +AC_MSG_CHECKING([for overzealous strict aliasing warnings]) +ignore_strict_aliasing=no +CXXFLAGS_SAVE=$CXXFLAGS +CXXFLAGS="$CXXFLAGS -Werror=strict-aliasing" +AC_COMPILE_IFELSE([ +#include +boost::optional x; +int func() { + return *x; +} +], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes]) +AC_MSG_RESULT($ignore_strict_aliasing) +CXXFLAGS=$CXXFLAGS_SAVE +if test "x$ignore_strict_aliasing" = "xyes"; then + CXXFLAGS="$CXXFLAGS -Wno-strict-aliasing" +fi + dnl ****************************** dnl Gettext stuff dnl ****************************** @@ -132,7 +171,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 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 th tr uk vi zh_CN zh_TW" AM_GLIB_GNU_GETTEXT AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -531,7 +570,6 @@ PKG_CHECK_MODULES(POPPLER, poppler >= 0.5.9, poppler=yes, poppler=no) if test "x$poppler" = "xyes"; then dnl Working libpoppler - POPPLER_LIBS="-lpoppler " dnl Have to test libpoppler-glib presence PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.5.9, poppler_glib=yes, poppler_glib=no) if test "x$poppler_glib" = "xyes"; then @@ -539,7 +577,7 @@ if test "x$poppler" = "xyes"; then dnl Check whether the Cairo SVG backend is available PKG_CHECK_MODULES(CAIRO_SVG, cairo-svg, cairo_svg=yes, cairo_svg=no) if test "x$cairo_svg" = "xyes"; then - POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib " + POPPLER_LIBS="$POPPLER_LIBS $POPPLER_GLIB_LIBS " fi fi if test "x$enable_poppler_cairo" = "xyes"; then @@ -549,7 +587,7 @@ if test "x$poppler" = "xyes"; then if test "x$poppler_glib" = "xyes" -a "x$poppler_cairo" = "xyes" -a \ "x$cairo_svg" = "xno" then - POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib " + POPPLER_LIBS="$POPPLER_LIBS $POPPLER_CAIRO_LIBS " fi fi fi @@ -567,9 +605,13 @@ fi AC_SUBST(POPPLER_CFLAGS) AC_SUBST(POPPLER_LIBS) -PKG_CHECK_MODULES(POPPLERNEW, poppler >= 0.8.3, popplernew=yes, popplernew=no) +PKG_CHECK_MODULES(POPPLER_GFXFONT, 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)]) + 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) +if test "x$popplercolor" = "xyes"; then + AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2]) fi dnl ****************************** @@ -603,8 +645,11 @@ dnl with_inkboard="no" dnl fi dnl AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes") -dnl AC_SUBST(INKBOARD_LIBS) -dnl AC_SUBST(INKBOARD_CFLAGS) + +INKBOARD_CFLAGS="" +INKBOARD_LIBS="" +AC_SUBST(INKBOARD_LIBS) +AC_SUBST(INKBOARD_CFLAGS) dnl ****************************** dnl Check for libwpg for extension @@ -657,10 +702,10 @@ PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 # Check for Apple Mac OS X Carbon framework carbon_ok=no AC_MSG_CHECKING([for Mac OS X Carbon support]) -AC_TRY_CPP([ +AC_COMPILE_IFELSE([ #include #include -], carbon_ok=yes) +], [carbon_ok=yes]) AC_MSG_RESULT($carbon_ok) if test "x$carbon_ok" = "xyes"; then AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) @@ -755,7 +800,7 @@ elif test "$enable_binreloc" = "auto"; then elif test "$enable_binreloc" = "no"; then AC_MSG_RESULT(no) else - AC_MSG_RESULT(no (unknown value "$enable_binreloc")) + AC_MSG_RESULT([no (unknown value "$enable_binreloc")]) enable_binreloc=no fi AC_DEFINE(BR_PTHREADS,[0],[Use binreloc thread support?]) @@ -918,7 +963,6 @@ AC_CONFIG_FILES([ Makefile src/Makefile src/check-header-compile -src/algorithms/makefile src/application/makefile src/bind/makefile src/debug/makefile @@ -931,7 +975,6 @@ src/extension/makefile src/extension/script/makefile src/filters/makefile src/helper/makefile -src/inkjar/makefile src/io/makefile src/libcroco/makefile src/libgdl/makefile @@ -943,10 +986,8 @@ src/live_effects/makefile src/live_effects/parameter/makefile src/pedro/makefile src/jabber_whiteboard/makefile -src/removeoverlap/makefile src/svg/makefile src/trace/makefile -src/traits/makefile src/ui/cache/makefile src/ui/dialog/makefile src/ui/makefile