* Arch-specific test to workaround that bug in mips toolchain is no more

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 46f3d0e8650d0fff44a18628c3d39cd843fc15fc..1bb787f3957d9f6e83e1f456d5c8c0f33939161a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,16 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.50)
+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.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_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,15 @@ 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_SVN_SNAPSHOT_BUILD
 
 dnl These next few lines are needed only while libcroco is in our source tree.
 AC_PROG_CC
@@ -94,8 +97,6 @@ fi
 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])
@@ -142,19 +143,15 @@ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 
 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 ******************************
@@ -652,7 +649,7 @@ 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
@@ -688,6 +685,17 @@ AC_CHECK_HEADER(popt.h,
                [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"
@@ -830,19 +838,8 @@ 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
 
-AC_DEFINE(WITH_MODULES, 1, [Use experimental module support])
-
 dnl ******************************
 dnl   libinkscape
 dnl ******************************
@@ -965,16 +962,25 @@ 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/tango/Makefile
+share/icons/tango/scalable/Makefile
+share/icons/tango/scalable/actions/Makefile
+share/icons/tango/scalable/places/Makefile
+share/icons/tango/scalable/status/Makefile
+share/icons/tango/16x16/Makefile
+share/icons/tango/16x16/actions/Makefile
+share/icons/tango/16x16/places/Makefile
+share/icons/tango/16x16/status/Makefile
+share/icons/tango/24x24/Makefile
+share/icons/tango/24x24/actions/Makefile
+share/icons/tango/24x24/places/Makefile
+share/icons/tango/24x24/status/Makefile
 share/keys/Makefile
 share/markers/Makefile
 share/palettes/Makefile