Add pango to recipe. Resolve

conflict.  Have I told you lately how much I love autotools?

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 940bc75d3bf913e7b89fd5f89df14e89d2bd428f..24e88aedce6a1281b0abbd3b4f6c5847abe6469d 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -33,14 +33,17 @@ PANGO_LIBTOOL=1.5.6-1
 
 # Please state your love for the autotools today
 if [ "$I_LOVE_AUTOTOOLS" = "" ] ; then
-  I_LOVE_AUTOTOOLS=no
+    I_LOVE_AUTOTOOLS=no
 else
-  I_LOVE_AUTOTOOLS=yes
+    I_LOVE_AUTOTOOLS=yes
 fi
 
 if [ -z "$AUTOCONF" ]; then
     unset AUTOCONF
 fi
+if [ -z "$AUTOHEADER" ]; then
+    unset AUTOHEADER
+fi
 
 
 # test: the name of our download and build directory
@@ -132,6 +135,13 @@ cd src
 tla get guile-gnome-devel@gnu.org--2004/libgnomecanvas--dev libgnomecanvas
 
 rm -rf $OPT/guile-gnome
+if false; then
+    libtoolize --copy --force
+    $AUTOHEADER
+    $ACLOCAL
+    $AUTOMAKE --copy --force
+    $AUTOCONF
+fi
 sh autogen.sh --noconfigure
 mkdir ../=build
 cd ../=build
@@ -141,6 +151,15 @@ export LD_LIBRARY_PATH=$OPT/g-wrap/lib:$LD_LIBRARY_PATH
 PKG_CONFIG_PATH=$OPT/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
 
 ../src/configure --prefix=$OPT/guile-gnome
+
+# Using libtool < 1.6.0 together with gcc-3.4 may trigger this problem:
+#
+#    If a tag has not been given, and we're using a compiler which is
+#    not one of the ones with which libtool was built, attempt to
+#    infer the compiler from the first word of the command line passed
+#    to libtool.
+#
+# Use gcc-3.3 or libtool-1.6.0
 make install CC=$GCC G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site
 
 GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH