From 1a68069ee28bc3348aa0ba547263b09a67e450a9 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 23 Mar 2008 22:12:25 +0000
Subject: [PATCH] If the Hunspell test fails, then hunspell should be disabled,
 I'll do this for all the tests eventually.

Originally committed to SVN as r2123.
---
 configure.in | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 253e698f1..50bc25fab 100644
--- a/configure.in
+++ b/configure.in
@@ -382,15 +382,6 @@ AC_ARG_WITH(hunspell, [  --without-hunspell      build without hunspell support
 if test "x$with_hunspell" != xno; then
   PKG_CHECK_MODULES(HUNSPELL, hunspell <= 1.1.10, [with_old_hunspell=yes], [with_old_hunspell=no])
 fi
-AM_CONDITIONAL([HAVE_HUNSPELL], [test "$with_old_hunspell" != "no"])
-if test "$with_old_hunspell" = "yes"; then
-  AC_DEFINE(WITH_OLD_HUNSPELL, 1, [Enable Older Hunspell support.])
-  HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS -DWITH_OLD_HUNSPELL"
-  with_hunspell="yes"
-  with_hunspell_version="(old hunspell)"
-else
-  with_hunspell="no"
-fi
 
 AC_AGI_COMPILE([Hunspell], [hunspell], [$HUNSPELL_CFLAGS], [$HUNSPELL_LIBS],[
 #include <hunspell.hxx>
@@ -403,8 +394,18 @@ int main(void) {
 
 if test "$agi_with_hunspell" = "no" && test "$with_hunspell" = "yes"; then
   AC_MSG_WARN([Hunspell detected, but it doesn't work..])
+  with_old_hunspell="no"
 fi
 
+AM_CONDITIONAL([HAVE_HUNSPELL], [test "$with_old_hunspell" != "no"])
+if test "$with_old_hunspell" = "yes"; then
+  AC_DEFINE(WITH_OLD_HUNSPELL, 1, [Enable Older Hunspell support.])
+  HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS -DWITH_OLD_HUNSPELL"
+  with_hunspell="yes"
+  with_hunspell_version="(old hunspell)"
+else
+  with_hunspell="no"
+fi
 
 
 ######################