Fix a couple of bugs

[claws.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
old mode 100644 (file)
new mode 100755 (executable)
index 8e182ae..e4a95f0
--- 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,32 @@ 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 git
+       exit 1
+fi
+
+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 git
+       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 git
+               exit 1
+       fi
+fi
+
 
 aclocal -I m4 \
   && libtoolize --force --copy \