Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws

[claws.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 0b8ff3cca4057404ac934f87f5cf83248f5d0386..694ef7cc4fdbd2ce4cf5ed21911d380758c5bac8 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,9 +12,9 @@ if [ "$bisonver" = "" ]; then
 fi
 
 if [ "$LEX" != "" ]; then
-       flexver=`$LEX --version|sed "s/.* //"`
+       flexver=`$LEX --version|awk '{print $2}'`
 else
-       flexver=`flex --version|sed "s/.* //"`
+       flexver=`flex --version|awk '{print $2}'`
 fi
 
 if [ "$flexver" = "" ]; then
@@ -24,17 +24,36 @@ 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
+
+       flex_numversion=$(expr \
+               $flex_major \* 10000 + \
+               $flex_minor \* 100 + \
+               $flex_micro)
+
+       if [ $flex_numversion -lt 20531 ]; 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 \
+case `uname` in
+       Darwin*)
+               if [ "`glibtoolize --version`" = "" ]; then
+                       echo MacOS requires glibtool from either Macport or brew
+                       exit 1
+               fi
+               LIBTOOL="glibtoolize --force --copy"
+               ;;
+       *)
+               LIBTOOL="libtoolize --force --copy"
+               ;;
+esac
+
+${LIBTOOL} \
+  && aclocal -I m4 \
+  && autoconf \
   && autoheader \
-  && automake --add-missing --foreign --copy \
-  && autoconf 
+  && automake --add-missing --foreign --copy
 if test -z "$NOCONFIGURE"; then
-exec ./configure --enable-maintainer-mode $@
+exec ./configure --enable-maintainer-mode "$@"
 fi