* scm/output-gnome.scm:

* buildscripts/guile-gnome.sh: Update wrt fixed GUILE CVS.

diff --git a/ChangeLog b/ChangeLog
index adf2f58ac2d1038b590e4873f7c84c17d0eb420c..dd104ef9703152c60a94006780f35daabd390f37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/output-gnome.scm: 
+       * buildscripts/guile-gnome.sh: Update wrt fixed GUILE CVS.
+
        * debian/: Apply Debian patch (Anthony Fok).
 
 2004-06-22  Heikki Junes   <hjunes@cc.hut.fi>

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 48d640511f9eea54c4204c59605bf557894568db..3d543a55cf1cc173c110ff5b7cbf4e27182c1a1d 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -15,17 +15,6 @@ set -ex
 # Where user built stuff will be installed
 OPT=$HOME/usr/pkg
 
-# Please state your love for the autotools today
-if [ "$I_LOVE_AUTOTOOLS" = "no" ]; then
-    MY_LIBTOOL=$(dpkg -l libtool | tail -1 | awk '{ print $3 }')
-    PANGO_LIBTOOL=1.5.6-1
-    if [ -x /usr/bin/gcc34 ] ;then
-       GCC34=gcc34
-    elif [ -x /usr/bin/gcc-3.4 ] ;then
-       GCC34=gcc-3.4
-    fi
-fi
-
 export AUTOMAKE=automake-1.8
 export ACLOCAL=aclocal-1.8
 export AUTOCONF=$(which autoconf2.50)
@@ -58,25 +47,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 ../..
 
 export PKG_CONFIG_PATH=$OPT/pango/lib/pkgconfig:$PKG_CONFIG_PATH
 
-
-## 3.  *** NOTE: use guile-1.6 for g-wrap and guile-gnome ***
-## using GUILE CVS g-wrap/guile-gnome is experimental (read: segfaults)
-## Assuming that system has guile-1.6 installed in /usr/bin 
-PATH=/usr/bin:$PATH
+# 3.  [removed]
 
 if [ -d $OPT/libffi/ ]; then
     export LDFLAGS=-L$OPT/libffi/lib
@@ -155,5 +134,5 @@ make install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site
 GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH
 LD_LIBRARY_PATH=$OPT/guile-gnome/lib:$LD_LIBRARY_PATH
 
-# simple test
-guile -s ../src/libgnomecanvas/examples/canvas.scm
+# simple test -- fails atm
+# guile -s ../src/libgnomecanvas/examples/canvas.scm

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 93fa0e322e7f050e5ae1a61560eb99826a4b2003..2f113d87a2eb9dcb3eb70bb0e1326c44158e734e 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -21,7 +21,6 @@
 
 ;;; You need:
 ;;;
-;;;   * guile-1.6.4 (NOT CVS -- we are working on this)
 ;;;   * Rotty's g-wrap--tng TLA, possibly Janneke's if you have libffi-3.4.
 ;;;   * guile-gnome TLA
 ;;;   * pango CVS (ie, > 2004-06-12)
@@ -30,16 +29,6 @@
 
 ;;; Try it
 ;;;
-;;;   * If you are using GUILE CVS, recompile LilyPond with GUILE 1.6.
-
-;;;     [If for some unknown or funny reason you do not want to
-;;;      overwrite your lilypond-bin with GUILE CVS, you can
-;;;      reconfigure a new configuration, say g16:
-"
-PATH=/usr/bin/:$PATH ./configure --enable-config=g16 && make conf=g16
-"
-;;;     ]
-;;;
 ;;;   * Install gnome/gtk development stuff
 ;;;
 ;;;   * Install g-wrap and guile-gnome, see buildscripts/guile-gnome.sh