[patch] files/2.2.0/hunspell.diff

hunspell.diff (text/plain), 1.51 KB, created by Gergan Penkov on 2007-05-22 22:51:38 UTC

--- config_office/configure.in.org	2007-05-23 01:14:35.000000000 +0200
+++ config_office/configure.in	2007-05-23 01:28:12.000000000 +0200
@@ -4411,6 +4411,7 @@
 if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_HUNSPELL=YES
+    OLDHUNSPELL=YES
     AC_LANG(C++)
     AC_CHECK_HEADER(hunspell.hxx, [],
     [
@@ -4418,7 +4419,15 @@
         [AC_MSG_ERROR(hunspell headers not found.)], [])
        ], [])
     AC_CHECK_LIB(hunspell, main, [],
-           [ AC_MSG_ERROR(hunspell library not found.) ], [])
+           [ OLDHUNSPELL=NO ], [])
+    if test "$OLDHUNSPELL" = "NO"; then 
+        PKG_CHECK_MODULES(HUNSPELL, [hunspell],
+        [SYSTEM_HUNSPELL=YES] , [SYSTEM_HUNSPELL=NO])
+        if test "$SYSTEM_HUNSPELL" = "YES"; then
+            HUNSPELLLIB="$HUNSPELL_LIBS"
+            AC_SUBST(HUNSPELLLIB)
+        fi
+    fi
 else
     AC_MSG_RESULT([internal])
     SYSTEM_HUNSPELL=NO
--- config_office/set_soenv.in.org	2007-05-23 04:57:21.000000000 +0200
+++ config_office/set_soenv.in	2007-05-23 04:58:10.000000000 +0200
@@ -1899,6 +1899,7 @@
 ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
 ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
 ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
+ToFile( "HUNSPELLLIB",       "@HUNSPELLLIB@",      "e" );
 ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
 ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
 ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",  "e" );