X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=eb5c22c5a545d875d87872576f5100c282075578;hb=1fa13559ef379875e427ec176aea683c603fb1bf;hp=aaef9dda4ce56548c3490f1a190073fd49a448dc;hpb=86bb0ec97eef378a8ec2e7a9e019656a6fbbe6f6;p=inkscape.git diff --git a/configure.ac b/configure.ac index aaef9dda4..eb5c22c5a 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 @@ -129,7 +132,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 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) @@ -155,7 +158,7 @@ fi dnl ****************************** dnl Check for libpng dnl ****************************** -AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)], png_ok=no, -lz -lm) +AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=yes)], png_ok=no, -lz -lm) if test "x$png_ok" != "xyes"; then AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape]) fi @@ -573,33 +576,36 @@ dnl ****************************** dnl Inkboard dependency checking dnl ****************************** -with_inkboard="no" -with_inkboard_ssl="no" +dnl with_inkboard="no" +dnl with_inkboard_ssl="no" -INKBOARD_CFLAGS="" +dnl INKBOARD_CFLAGS="" -AC_ARG_ENABLE(inkboard, - AS_HELP_STRING([--enable-inkboard], [enable Inkboard online whiteboard facility (disabled by default)]), - with_inkboard=$enableval,with_inkboard=no) +dnl AC_ARG_ENABLE(inkboard, +dnl AS_HELP_STRING([--enable-inkboard], [enable Inkboard online whiteboard facility (disabled by default)]), +dnl with_inkboard=$enableval,with_inkboard=no) -if test "x$with_inkboard" = "xyes"; then - with_inkboard="yes" - AC_DEFINE(WITH_INKBOARD,1,[Build in Inkboard support]) +dnl if test "x$with_inkboard" = "xyes"; then +dnl with_inkboard="yes" +dnl AC_DEFINE(WITH_INKBOARD,1,[Build in Inkboard support]) dnl Test for OpenSSL - PKG_CHECK_MODULES(INKBOARD, openssl, with_inkboard_ssl=yes, with_inkboard_ssl=no) - if test "x$with_inkboard_ssl" = "xyes"; then +dnl PKG_CHECK_MODULES(INKBOARD, openssl, with_inkboard_ssl=yes, with_inkboard_ssl=no) +dnl if test "x$with_inkboard_ssl" = "xyes"; then dnl OpenSSL found; enable SSL support in Pedro - INKBOARD_CFLAGS="$INKBOARD_CFLAGS -DHAVE_SSL" - RELAYTOOL([ssl], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes]) - RELAYTOOL([crypto], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes]) - AC_DEFINE(WITH_INKBOARD_SSL,1,[Build in SSL support for Inkboard]) - fi -else - with_inkboard="no" -fi +dnl INKBOARD_CFLAGS="$INKBOARD_CFLAGS -DHAVE_SSL" +dnl RELAYTOOL([ssl], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes]) +dnl RELAYTOOL([crypto], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes]) +dnl AC_DEFINE(WITH_INKBOARD_SSL,1,[Build in SSL support for Inkboard]) +dnl fi +dnl else +dnl with_inkboard="no" +dnl fi + +dnl AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes") -AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes") +INKBOARD_CFLAGS="" +INKBOARD_LIBS="" AC_SUBST(INKBOARD_LIBS) AC_SUBST(INKBOARD_CFLAGS) @@ -649,15 +655,15 @@ if test $cc_vers_major -gt 3; then else min_sigc_version=2.0.11 fi -PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl) +PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl) # 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]) @@ -669,6 +675,42 @@ AM_CONDITIONAL(HAVE_CARBON, test "x$carbon_ok" = "xyes") # Check for some boost header files AC_CHECK_HEADERS([boost/concept_check.hpp], [], AC_MSG_ERROR([You need the boost package (e.g. libboost-dev)])) +# Test whether GCC emits a spurious warning when using boost::optional +# If yes, turn off strict aliasing warnings to reduce noise +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 + +# Test for broken unordered_set on GCC 4.0.0, shipped with Apple XCode tools +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_broken=no], [unordered_set_broken=yes]) +if test "x$unordered_set_broken" = "xyes"; then + AC_MSG_RESULT([broken]) + AC_MSG_ERROR([You have a broken version of the header. See http://wiki.inkscape.org/wiki/index.php/CompilingMacOsX for information on how to fix this problem.]) +else + AC_MSG_RESULT([ok]) +fi + PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, cairo_pdf=yes, cairo_pdf=no) if test "x$cairo_pdf" = "xyes"; then AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available]) @@ -838,15 +880,6 @@ if test "$GXX" = "yes"; then # Add even more stuff CXXFLAGS="-Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS" - dnl Test for arch-specific situations. - case "$host_cpu" in - mips|mipsel) - dnl Symbol tables can get too large: this uses alternate tables - dnl See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=283476 - CXXFLAGS="$CXXFLAGS -Wa,-xgot" - CFLAGS="$CFLAGS -Wa,-xgot" - ;; - esac fi dnl ****************************** @@ -971,16 +1004,19 @@ share/extensions/Makefile share/extensions/alphabet_soup/Makefile share/extensions/Barcode/Makefile share/extensions/Poly3DObjects/Makefile +share/extensions/test/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/places/Makefile -share/icons/hicolor/scalable/status/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 @@ -1021,8 +1057,6 @@ Configuration: Internal Python: ${with_python} Internal Perl: ${with_perl} Enable LittleCms: ${enable_lcms} - Enable Inkboard: ${with_inkboard} - Enable SSL in Inkboard: ${with_inkboard_ssl} Enable Poppler-Cairo: ${enable_poppler_cairo} ImageMagick Magick++: ${magick_ok} Libwpg: ${with_libwpg}