X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=7e311a78c06866b9abb01c75e74f5afdef30ab2e;hb=c81abf43f820c1bf1602cf580d9b6409284ddc95;hp=5bf86e096b9e80b49148758361d563f8d1f98901;hpb=44aa4bdf094f63e3f9e5ccf1c84b835c3e06863b;p=inkscape.git diff --git a/configure.ac b/configure.ac index 5bf86e096..7e311a78c 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.46+devel) +AC_INIT(inkscape, 0.47+devel) AC_CANONICAL_HOST AC_CONFIG_SRCDIR([src/main.cpp]) @@ -31,7 +31,10 @@ 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])]) dnl These next few lines are needed only while libcroco is in our source tree. AC_PROG_CC @@ -122,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 ****************************** @@ -129,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) @@ -528,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 @@ -536,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 @@ -546,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 @@ -564,9 +605,35 @@ 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 + +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 + +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 ****************************** @@ -657,10 +724,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 +822,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?]) @@ -855,61 +922,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]) @@ -918,7 +930,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 +942,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 +953,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 @@ -971,6 +979,13 @@ share/filters/Makefile share/fonts/Makefile share/gradients/Makefile share/icons/Makefile +share/icons/application/Makefile +share/icons/application/16x16/Makefile +share/icons/application/22x22/Makefile +share/icons/application/24x24/Makefile +share/icons/application/32x32/Makefile +share/icons/application/48x48/Makefile +share/icons/application/256x256/Makefile share/keys/Makefile share/markers/Makefile share/palettes/Makefile @@ -1006,7 +1021,6 @@ 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}