X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=autogen.sh;h=33afc8230fb4ecfb5aac4a307d0394e54255d45e;hp=8e182ae03d2f97836a3af0a60ce01e2bc95740b3;hb=8b44bf1715adf6a18e24fb421e40a299acbc1476;hpb=820b22c7ae2ebeaf78a7b2474f3e821c3e83457b

diff --git a/autogen.sh b/autogen.sh
index 8e182ae03..33afc8230 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,10 +36,11 @@ if test "$1" = "--build-w32"; then
              --with-libiconv-prefix=${w32root} \
              --with-gpg-error-prefix=${w32root} \
 	     --with-gpgme-prefix=${w32root} \
-             --with-config-dir="Sylpheed-claws" \
+             --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=$?
@@ -47,6 +48,28 @@ if test "$1" = "--build-w32"; then
 fi
 # ***** end W32 build script *******
 
+bisonver=`bison --version`
+
+if [ "$bisonver" = "" ]; then
+	echo Bison is needed to compile Claws Mail CVS
+	exit 1
+fi
+
+flexver=`flex --version|sed "s/.* //"`
+
+if [ "$flexver" = "" ]; then
+	echo Flex 2.5.31 or greater is needed to compile Claws Mail CVS
+	exit 1
+else
+	flex_major=`echo $flexver|sed "s/\..*//"`
+	flex_minor=`echo $flexver|sed "s/$flex_major\.\(.*\)\..*/\1/"`
+	flex_micro=`echo $flexver|sed "s/$flex_major\.$flex_minor\.\(.*\)/\1/"`
+	if [ $flex_major -lt 2 -o $flex_minor -lt 5 -o $flex_micro -lt 31 ]; then
+		echo Flex 2.5.31 or greater is needed to compile Claws Mail CVS
+		exit 1
+	fi
+fi
+
 
 aclocal -I m4 \
   && libtoolize --force --copy \