Add pango to recipe. Resolve

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

diff --git a/ChangeLog b/ChangeLog
index 8c614df9cc93a4373a5c0775b26181e28afcc264..33da397b4c54a64659156d89c70380001d1feac2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-06-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * buildscripts/guile-gnome.sh: Add pango to recipe.  Resolve
-       conflict.
+       conflict.  Have I told you lately how much I love autotools?
 
 2004-06-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 8aa4c2132dd8366461a5b65f4cddc1dbf140823e..e63a92ffa209d8c71b8646bf805792e4f20cbe49 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -24,7 +24,15 @@ if [ -x /usr/bin/gcc-3.4 ] ;then
 fi
 
 export AUTOMAKE=automake-1.8
+export ACLOCAL=aclocal-1.8
 export AUTOCONF=$(which autoconf2.50)
+export AUTOHEADER=$(which autoheader2.50)
+
+MY_LIBTOOL=$(dpkg -l libtool | tail -1 | awk '{ print $3 }')
+PANGO_LIBTOOL=1.5.6-1
+
+# Please state your love for the autotools today
+I_LOVE_AUTOTOOLS=no
 
 if [ -z "$AUTOCONF" ]; then
     unset AUTOCONF
@@ -42,6 +50,7 @@ cd test
 
 ## 2.  get pango CVS
 
+
 mkdir -p gnome/CVS
 cd gnome
 echo ":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome" > CVS/Root
@@ -49,9 +58,15 @@ echo "." > CVS/Repository
 cvs -z3 checkout -P pango
 cd pango
 rm -rf $OPT/pango
+if [ "$I_LOVE_AUTOTOOLS" = "no" ]; then
+    sudo apt-get --yes --force-yes install libtool=$PANGO_LIBTOOL
+fi    
 ./autogen.sh --help
 ./configure --prefix=$OPT/pango --enable-maintainer-mode --enable-gtk-doc
 make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" install
+if [ "$I_LOVE_AUTOTOOLS" = "no" ]; then
+    sudo apt-get --yes --force-yes install libtool=$MY_LIBTOOL
+fi    
 
 cd ../..