2012-11-06 [mones] 3.8.1cvs112

[claws.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 9dae8dd3445dd8e472a61ac07161c2e8f666aa96..33d10c5eb7ce070acdf62c38eb3cb68641e6e892 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,8 +38,9 @@ if test "$1" = "--build-w32"; then
             --with-gpgme-prefix=${w32root} \
              --with-config-dir="Claws-mail" \
              --disable-openssl --disable-dillo-viewer-plugin \
-             --disable-nls --disable-libetpan --disable-aspell \
+             --disable-nls --disable-libetpan --disable-enchant \
              --disable-trayicon-plugin --disable-spamassassin-plugin \
+             --disable-bogofilter-plugin --disable-valgrind \
              PKG_CONFIG_LIBDIR="$w32root/lib/pkgconfig"
 
     rc=$?
@@ -54,7 +55,11 @@ if [ "$bisonver" = "" ]; then
        exit 1
 fi
 
-flexver=`flex --version|sed "s/.* //"`
+if [ "$LEX" != "" ]; then
+       flexver=`$LEX --version|sed "s/.* //"`
+else
+       flexver=`flex --version|sed "s/.* //"`
+fi
 
 if [ "$flexver" = "" ]; then
        echo Flex 2.5.31 or greater is needed to compile Claws Mail CVS