2006-03-06 [colin] 2.0.0cvs115

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dbc97d4485174b542eb80fb57572ca46093ff463..8da1fe8b6370b4d1bd275bcf68d8aa96657d7cd1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=115
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -122,6 +122,18 @@ esac
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, test x"$os_win32" = x"yes")
 
+AC_MSG_CHECKING([for Cygwin])
+case "$host" in
+  *-*-cygwin*)
+    env_cygwin=yes
+    ;;
+  *)
+    env_cygwin=no
+    ;;
+esac
+AC_MSG_RESULT([$env_cygwin])
+AM_CONDITIONAL(CYGWIN, test x"$env_cygwin" = x"yes")
+
 CFLAGS="$CFLAGS -Wall"
 
 pthread_name=
@@ -616,6 +628,7 @@ if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_MSG_RESULT(yes)
        AC_SPAMASSASSIN
        PLUGINS="spamassassin $PLUGINS"
+       AC_DEFINE(USE_SPAMASSASSIN_PLUGIN, 1, Define if spamassassin plugin is being build.)
 else
        AC_MSG_RESULT(no)
 fi
@@ -737,7 +750,7 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
          AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
          if test "x$libetpan_result" = "xyes"; then
            AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
-           LDFLAGS="$LDFLAGS `$libetpanconfig --libs 2>/dev/null`"
+           LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
            AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
            AC_MSG_RESULT([$libetpan_result])
          fi