r15255 - gnucash/trunk - MacOSX installed libtoolize as glibtoolize. Handle that in autogen

Derek Atkins warlord at cvs.gnucash.org
Mon Dec 25 13:38:10 EST 2006


Author: warlord
Date: 2006-12-25 13:38:10 -0500 (Mon, 25 Dec 2006)
New Revision: 15255
Trac: http://svn.gnucash.org/trac/changeset/15255

Modified:
   gnucash/trunk/
   gnucash/trunk/autogen.sh
Log:
MacOSX installed libtoolize as glibtoolize.  Handle that in autogen



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1024
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13759
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1024
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13763
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/trunk/autogen.sh
===================================================================
--- gnucash/trunk/autogen.sh	2006-12-25 18:29:57 UTC (rev 15254)
+++ gnucash/trunk/autogen.sh	2006-12-25 18:38:10 UTC (rev 15255)
@@ -135,12 +135,17 @@
   DIE=1
 }
 
+# On MacOS, libtoolize is installed as glibtoolize, so handle that here.
 (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
+  LIBTOOLIZE=glibtoolize
+  (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
+    echo "Could not find either \`libtoolize' or \'glibtoolize'."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+    DIE=1
+  }
 }
 
 (${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {



More information about the gnucash-changes mailing list