make aspell optional

diff --git a/build.xml b/build.xml
index 7a1d2bced9d8d858ccee6fb19f1ff7b31ed435dd..4aa2b882d86df6293413071d4767d322f6056029 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -181,6 +181,8 @@
         /* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */
         // #define LPE_ENABLE_TEST_EFFECTS    1
 
+        #define HAVE_ASPELL                   1
+
         #endif /* _CONFIG_H_ */
     </makefile>
   </target>

diff --git a/configure.ac b/configure.ac
index 9fe7c9afc2a6f2a3ff0a7c73fbf53fc4f176e82b..aaef9dda4ce56548c3490f1a190073fd49a448dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -689,10 +689,12 @@ 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])
+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
-INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
 
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 sp_save_LIBS=$LIBS

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 5d110483dc3144beae7ebbbe6af5709b72f0bb90..503a52cc33911f625937aee52e27295b3384d8cb 100644 (file)
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -238,8 +238,10 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"ObjectFlowtextToText\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionTextRemoveKerns\" />\n"
+#ifdef HAVE_ASPELL
 "       <separator/>\n"
 "       <verb verb-id=\"DialogSpellcheck\" />\n"
+#endif
 "   </submenu>\n"
 "   <submenu name=\"" N_("Filter_s") "\">\n"
 "       <filters-list/>\n"