seed r708 - trunk

[hortont svn gnome org]

Author: hortont
Date: Sun Jan 11 06:32:10 2009
New Revision: 708
URL: http://svn.gnome.org/viewvc/seed?rev=708&view=rev

Log:
Working on fixing build on Mac OS X. Still fails because it can't find libwebkit, of course.


Modified:
   trunk/README
   trunk/autogen.sh

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Sun Jan 11 06:32:10 2009
@@ -21,3 +21,7 @@
    * clutter-cairo (libclutter-cairo-0.8-dev)
    * cairo (libcairo-dev)
    * gtk-doc (gtk-doc-tools)
+
+-- If building on OS X, install automake, autoconf, gtk-doc, etc. from MacPorts;
+   then, export PATH=/opt/local/bin:$PATH (if /opt/local is your MacPorts installation)
+   and build Seed as you normally would.
\ No newline at end of file

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Sun Jan 11 06:32:10 2009
@@ -57,7 +57,8 @@
 }
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  (libtool --version) < /dev/null > /dev/null 2>&1 || 
+  (glibtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/";
@@ -139,7 +140,7 @@
       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
-	  libtoolize --force --copy
+	  libtoolize --force --copy || glibtoolize --force --copy
 	fi
       fi
       echo "Running aclocal $aclocalinclude ..."