From: Paul <paul@claws-mail.org>
Date: Fri, 16 Jun 2017 09:05:15 +0000 (+0100)
Subject: fix building on MAC. fixes bug 3835, 'autogen.sh fails with invalid test on line 33'
X-Git-Tag: 3.16.0~134^2~1
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c8e4c10674d1abee12764bf67fc0bda2e4a4fea9

fix building on MAC. fixes bug 3835, 'autogen.sh fails with invalid test on line 33'

fix by Michael Vilain <michael@vilain.com>
---

diff --git a/AUTHORS b/AUTHORS
index f84b2cc32..a387e3f48 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -312,3 +312,4 @@ contributors (in addition to the above; based on Changelog)
 	Darac Marjal
 	Ashish Gupta
 	Olivier Brunel
+	Michael Vilain
diff --git a/autogen.sh b/autogen.sh
index 093adb39a..f2f62c93d 100755
--- 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
@@ -36,8 +36,21 @@ else
 	fi
 fi
 
+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
+
 aclocal -I m4 \
-  && libtoolize --force --copy \
+  && ${LIBTOOL} \
   && autoheader \
   && automake --add-missing --foreign --copy \
   && autoconf 
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index f5d958c69..7f8c09c09 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -294,6 +294,7 @@ static char *CONTRIBS_LIST[] = {
 "Petr Vanek",
 "Jeroen Versteeg",
 "Kevin Vigor",
+"Michael Vilain",
 "Johan Vromans",
 "Botalov Vyacheslav",
 "Radek Vybiral",