diff options
| author | bulia byak <buliabyak@gmail.com> | 2009-02-24 17:08:28 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2009-02-24 17:08:28 +0000 |
| commit | f8cf2d200139f5dc3123d38d6aa94509373dfd83 (patch) | |
| tree | a1258375a5f80548cd353896191277f62f568aed | |
| parent | Fix whiteboard compilation. (diff) | |
| download | inkscape-f8cf2d200139f5dc3123d38d6aa94509373dfd83.tar.gz inkscape-f8cf2d200139f5dc3123d38d6aa94509373dfd83.zip | |
make aspell optional
(bzr r7361)
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/menus-skeleton.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -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 9fe7c9afc..aaef9dda4 100644 --- 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 5d110483d..503a52cc3 100644 --- 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" |