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 f84b2cc32e53c7eeda69398bfd6ce4da27bb514f..a387e3f481e7189dd9d1e3068a4b1890f08430a6 100644 (file)
--- 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 093adb39a5c28c25f95843de2f64cd5ebb9b99d5..f2f62c93d10437f9055c16a2e80a638f1933c81a 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
@@ -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 f5d958c6962a7275c307d9a4f2195f7e02dbd49f..7f8c09c09803060a5b8ae189547abe7fa7aa1665 100644 (file)
--- 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",