![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index c5c9952c165fd5a77d9c93e4adf7ad2dae6ce72a..eb5c22c5a545d875d87872576f5100c282075578 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.50)
-AC_INIT(inkscape, 0.46+devel)
-dnl N.B. After 0.40, please change to `0.40+cvs' instead of `0.41cvs'.
-dnl Rationale: (i) placate simple version comparison software such as
-dnl `dpkg --compare-versions'. (ii) We don't always know what the next
-dnl version is going to be called until about the time we release it
-dnl (whereas we always know what the previous version was called).
+AC_PREREQ(2.53)
+
+# Always use 0.xx+devel instead of 0.xxdevel for the version, e.g. 0.46+devel.
+# Rationale: (i) placate simple version comparison software such as
+# `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.47+devel)
+
AC_CANONICAL_HOST
-AC_CONFIG_SRCDIR(src/main.cpp)
+AC_CONFIG_SRCDIR([src/main.cpp])
AM_INIT_AUTOMAKE([dist-zip dist-bzip2 tar-pax])
AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [
@@ -21,14 +23,18 @@ AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build config
AM_CONFIG_HEADER(config.h)
-AC_PROG_INTLTOOL(0.22)
-
AC_LANG(C++)
AC_ISC_POSIX
AC_PROG_CXX
AM_PROG_CC_STDC
AM_PROG_AS
+AC_PROG_RANLIB
+AC_PROG_INTLTOOL(0.22)
AC_HEADER_STDC
+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
dnl Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-AC_PROG_RANLIB
-
dnl Verify our GCC version
if test "x$GXX" = "xyes"; then
AC_MSG_CHECKING([GNU compiler version])
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)
dnl ******************************
dnl Check for OpenMP
+dnl Replace this with AC_OPENMP once Autoconf 2.62 is widespread
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 ******************************
-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
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)
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 <Carbon/Carbon.h>
#include <CoreServices/CoreServices.h>
-], 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])
# 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.hpp>
+boost::optional<int> 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 <tr1/unordered_set>
+int main() {
+ std::tr1::unordered_set<int> 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 <tr1/unordered_set> 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])
[INKSCAPE_LIBS="$INKSCAPE_LIBS -lpopt"],
AC_MSG_ERROR([libpopt is required]))
+dnl **************************
+dnl Check for aspell
+dnl ******************************
+AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
+if test "x$aspell_ok" = "xyes"; then
+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
+else
+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
+fi
+
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
sp_save_LIBS=$LIBS
LIBS="$LIBS $INKSCAPE_LIBS"
# 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
-AC_DEFINE(WITH_MODULES, 1, [Use experimental module support])
-
dnl ******************************
dnl libinkscape
dnl ******************************
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/devices/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
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}