Fixed build issues related to libaspell detection - thanks to bulia

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fb430b24892a6713310e87f0694afbef9591dbf9..869c4d265b2bb56994728147e75cf86b9b09ee7d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -688,6 +688,15 @@ 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_MSG_ERROR([aspell is needed to compile inkscape])
+fi
+INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
+
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 sp_save_LIBS=$LIBS
 LIBS="$LIBS $INKSCAPE_LIBS"
@@ -910,33 +919,9 @@ fi
 
 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
@@ -994,6 +979,11 @@ 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/keys/Makefile
 share/markers/Makefile
 share/palettes/Makefile