fix bug 3407, 'Pressing the "Date" column header to "sort by date" causes all columns...

[claws.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
old mode 100644 (file)
new mode 100755 (executable)
index 9dae8dd..b96f1a7
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# Copyright 1999-2014 the Claws Mail team.
+# This file is part of Claws Mail package, and distributed under the
+# terms of the General Public License version 3 (or later).
+# See COPYING file for license details.
 
 # ***** W32 build script *******
 # Used to cross-compile for Windows.
@@ -38,8 +42,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=$?
@@ -50,29 +55,34 @@ fi
 bisonver=`bison --version`
 
 if [ "$bisonver" = "" ]; then
-       echo Bison is needed to compile Claws Mail CVS
+       echo Bison is needed to compile Claws Mail git
        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
+       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 CVS
+               echo Flex 2.5.31 or greater is needed to compile Claws Mail git
                exit 1
        fi
 fi
 
-
 aclocal -I m4 \
   && libtoolize --force --copy \
   && autoheader \
   && automake --add-missing --foreign --copy \
-  && autoconf \
-  && ./configure --enable-maintainer-mode $@
+  && autoconf 
+if test -z "$NOCONFIGURE"; then
+exec ./configure --enable-maintainer-mode $@
+fi