diff --git a/configure.ac b/configure.ac
index edbb583eb96a9d1a0d02cb7eb488a026ded607d5..aaef9dda4ce56548c3490f1a190073fd49a448dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
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
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])
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 ******************************
break], [gc_ok=no], [$gc_libs])
break],
[gc_ok=no])
-if test "x$gc_ok" = "xyes" && "x$cross_compiling" = "xno" ; then
+if test "x$gc_ok" = "xyes" && test "x$cross_compiling" = "xno" ; then
AC_MSG_CHECKING([libgc version 6.4+])
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
[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"
esac
fi
-AC_DEFINE(WITH_MODULES, 1, [Use experimental module support])
-
dnl ******************************
dnl libinkscape
dnl ******************************
AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
-dnl Figure out where the datadir actually is
-dnl http://autoconf-archive.cryp.to/ac_define_dir.html
-prefix_NONE=
-exec_prefix_NONE=
-test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}. Thus we have to use `eval' twice.
-eval runtime_datadir="${datadir}"
-eval runtime_datadir="${runtime_datadir}"
-test "$prefix_NONE" && prefix=NONE
-test "$exec_prefix_NONE" && exec_prefix=NONE
-
-inkscape_sharedir="${runtime_datadir}/${PACKAGE_NAME}"
-
dnl Define our data paths for config.h
-AC_SUBST(INKSCAPE_DATADIR)
-AC_DEFINE_UNQUOTED([INKSCAPE_DATADIR], "${runtime_datadir}",
- [Base data directory -- only path-prefix.h should use it!])
-AC_SUBST(PACKAGE_LOCALE_DIR)
-AC_DEFINE_UNQUOTED([PACKAGE_LOCALE_DIR], "${runtime_datadir}/locale",
- [Localization directory])
-AC_SUBST(INKSCAPE_LIBDIR)
-AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "${prefix}/lib",
- [Base library directory -- only path-prefix.h should use it!])
-
-dnl Have to add module makefiles (lauris)
+AC_DEFINE_DIR([INKSCAPE_DATADIR], [datadir], [Base data directory])
+AC_DEFINE_DIR([PACKAGE_LOCALE_DIR], [localedir], [Locatization directory])
AC_CONFIG_FILES([
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/keys/Makefile
share/markers/Makefile
share/palettes/Makefile