From 86bb0ec97eef378a8ec2e7a9e019656a6fbbe6f6 Mon Sep 17 00:00:00 2001 From: buliabyak Date: Tue, 24 Feb 2009 17:08:28 +0000 Subject: [PATCH] make aspell optional --- build.xml | 2 ++ configure.ac | 8 +++++--- src/menus-skeleton.h | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 7a1d2bced..4aa2b882d 100644 --- 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_ */ 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[] = " \n" " \n" " \n" +#ifdef HAVE_ASPELL " \n" " \n" +#endif " \n" " \n" " \n" -- 2.30.2