Bogofilter: In addition to deleting or saving a spam message, allow third option...

[claws.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 33d10c5eb7ce070acdf62c38eb3cb68641e6e892..b96f1a7eedc06d66a74d7b10ebd34d3d507b05b6 100755 (executable)
--- 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.
@@ -51,7 +55,7 @@ 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
 
@@ -62,22 +66,23 @@ else
 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