From 88d618c510ce7278d3602d28de25527928f2dee6 Mon Sep 17 00:00:00 2001
From: Melvin Hadasht <melvin.hadasht@free.fr>
Date: Thu, 31 Oct 2002 15:50:57 +0000
Subject: [PATCH] ac/aspell.m4 	Fixed --disable-aspell-test bug configure.in 
 Fixed typo in a commentary (Aspell code)

---
 ChangeLog.claws | 10 ++++++++++
 ac/aspell.m4    | 45 +++++++++++++++++++++++++++------------------
 configure.in    |  4 ++--
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3c757a255..ab987ee03 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2002-10-31 [melvin]	0.8.5claws64
+
+	* ac/aspell.m4
+		Fixed --disable-aspell-test. Now --disable-aspell-test will 
+		not run any GNU/aspell test.  The dictionary path will
+		be by default /usr/local/lib/aspell/ unless --with-aspell-prefix
+		was given, in which case, it will be $prefix/lib/aspell/
+	* configure.in
+		Fixed typo in commentary (Aspell code).
+
 2002-10-31 [paul]	0.8.5claws63
 
 	* po/POTFILES.in
diff --git a/ac/aspell.m4 b/ac/aspell.m4
index dcc36a092..b3572e543 100644
--- a/ac/aspell.m4
+++ b/ac/aspell.m4
@@ -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>
diff --git a/configure.in b/configure.in
index e3787fd14..6b296a916 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws63
+EXTRA_VERSION=claws64
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -291,7 +291,7 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-dnl ASPELL is user for spell checking
+dnl GNU/Aspell is used for spell checking
 AC_ARG_ENABLE(aspell,
 	[  --enable-aspell         Enable GNU/aspell support [default=no]],
 	[ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=no])
-- 
2.25.1