This commit was manufactured by cvs2svn to create branch 'gtk2'.

[claws.git] / ac / aspell.m4

diff --git a/ac/aspell.m4 b/ac/aspell.m4
index dcc36a09210b1b93b7d0f4c81bb8b70db402707c..040692d443cf08619ecde19dbfad1e876d2f201f 100644 (file)
--- a/ac/aspell.m4
+++ b/ac/aspell.m4
@@ -9,7 +9,7 @@ dnl AM_PATH_ASPELL([MINIMUM-VERSION,
 dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for aspell, and define ASPELL_CFLAGS, ASPELL_LIBS and ASPELL_PATH
 dnl
-AC_DEFUN(AM_PATH_ASPELL,
+AC_DEFUN([AM_PATH_ASPELL],
 [dnl
 dnl Get the cflags and libraries from the aspell-config script
 dnl
@@ -36,6 +36,7 @@ dnl
      if test x$aspell_libs = x ; then
         aspell_libs=$aspell_prefix/lib
      fi
+     aspell_path=$aspell_prefix/lib/aspell
   fi
   if test x$aspell_includes = x ; then
      aspell_includes=/usr/local/include
@@ -43,26 +44,34 @@ dnl
   if test x$aspell_libs = x ; then
      aspell_libs=/usr/local/lib
   fi
-
-  AC_PATH_PROG(ASPELL, aspell, no)
-  min_aspell_version=ifelse([$1], ,.50,$1)
-  AC_MSG_CHECKING(for GNU/aspell - version >= $min_aspell_version)
-  no_aspell=""
-  if test "$ASPELL" = "no" ; then
-     echo "*** The aspell executable could not be found"
-     echo "*** If aspell was installed in PREFIX, make sure PREFIX/bin is in"
-     echo "*** your path, or set the ASPELL environment variable to the"
-     echo "*** full path to aspell or configure with --with-aspell-prefix=PREFIX."
-     ASPELL_CFLAGS=""
-     ASPELL_LIBS=""
-     ASPELL_PATH=""
-     no_aspell=yes
-     ifelse([$3], , :, [$3])
-  else
+  if test x$aspell_path = x ; then
+     aspell_path=/usr/local/lib/aspell
+  fi
+  if test "x$enable_aspelltest" != "xyes" ; then
+     echo "*** Disabling GNU/aspell tests upon user request" 
      ASPELL_CFLAGS="-I$aspell_includes"
      ASPELL_LIBS="-L$aspell_libs -laspell"
-     aspell_version=`$ASPELL version|sed -e "s/\(@(#) International Ispell Version 3.1.20 (but really Aspell \)\(.*\))/\2/"`
-     if test "x$enable_aspelltest" = "xyes" ; then
+     AC_DEFINE_UNQUOTED(ASPELL_PATH, "${aspell_path}/", Define ASPELL's default directory)
+     ifelse([$2], , :, [$2])
+  else   
+     AC_PATH_PROG(ASPELL, aspell, no)
+     min_aspell_version=ifelse([$1], ,.50,$1)
+     AC_MSG_CHECKING(for GNU/aspell - version >= $min_aspell_version)
+     no_aspell=""
+     if test "$ASPELL" = "no" ; then
+        echo "*** The aspell executable could not be found"
+        echo "*** If aspell was installed in PREFIX, make sure PREFIX/bin is in"
+        echo "*** your path, or set the ASPELL environment variable to the"
+        echo "*** full path to aspell or configure with --with-aspell-prefix=PREFIX."
+        ASPELL_CFLAGS=""
+        ASPELL_LIBS=""
+        ASPELL_PATH=""
+        no_aspell=yes
+        ifelse([$3], , :, [$3])
+     else
+        ASPELL_CFLAGS="-I$aspell_includes"
+        ASPELL_LIBS="-L$aspell_libs -laspell"
+        aspell_version=`$ASPELL version|sed -e "s/\(@(#) International Ispell Version 3.1.20 (but really Aspell \)\(.*\))/\2/"`
         rm -f conf.aspelltest
         AC_TRY_RUN([
 #include <stdio.h>
@@ -79,7 +88,7 @@ main ()
  return 0;
 }
         ],, no_aspell=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       rm -f conftest.c
+        rm -f conf.aspelltest
        if test "x$no_aspell" = x ; then
            AC_MSG_RESULT(yes)
            AC_MSG_CHECKING(for GNU/aspell dictionaries location)
@@ -91,7 +100,6 @@ main ()
            ac_save_LIBS="$LIBS"
            CFLAGS="$CFLAGS $ASPELL_CFLAGS"
            LIBS="$LIBS $ASPELL_LIBS"
-           rm -f conf.aspelltest
            AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>