* configure.in: Require makeinfo 4.7 (needed for @ifdocbook).

* stepmake/aclocal.m4 (STEPMAKE_GET_VERSION): Grok fontforge-like
date versions.  Fixes configure.
(STEPMAKE_CHECK_VERSION): Support optional actual program version
argument.

diff --git a/ChangeLog b/ChangeLog
index dde07b37fa91dfbc97af707c579982efbdf301e0..211ddfcc267e0e09e4feb0bf71c142d1d6348ff5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-11  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * configure.in: Require makeinfo 4.7 (needed for @ifdocbook).
+
+       * stepmake/aclocal.m4 (STEPMAKE_GET_VERSION): Grok fontforge-like
+       date versions.  Fixes configure.
+       (STEPMAKE_CHECK_VERSION): Support optional actual program version
+       argument.
+
 2004-12-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * buildscripts/mf-to-table.py (write_ps_encoding): write real

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 8ea987dcc03a29d23cb6c5b05ff999a9667c7d6d..1653fd52067b1a2f99ead1edf9710d1319f7d817 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -21,7 +21,8 @@ SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
-GGVERSION=2.7.95
+PANGOVERSION=1.6.0
+GGVERSION=2.7.97
 GWRAPVERSION=1.9.3
 
 download=$HOME/usr/src/releases
@@ -67,9 +68,9 @@ if ! pkg-config --atleast-version=1.5.1 pango; then
        echo "." > CVS/Repository
        cvs -z3 checkout -P pango
     else
-        $WGET ftp://ftp.gtk.org/pub/gtk/v2.5/pango-1.5.2.tar.gz
-       tar -xzf $download/pango-1.5.2.tar.gz
-       ln -s pango-1.5.2 pango
+        $WGET ftp://ftp.gtk.org/pub/gtk/v2.6/pango-$PANGOVERSION.tar.gz
+       tar -xzf $download/pango-$PANGOVERSION.tar.gz
+       ln -s pango-$PANGOVERSION pango
     fi
     cd pango
     rm -rf $OPT/pango
@@ -206,6 +207,14 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
     make all install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site
 fi
 
+cat <<EOF
+***********************************************************************
+Before using with Lily, do
+
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+    export GUILE_LOAD_PATH=$GUILE_LOAD_PATH
+EOF
+
 # simple test -- fails atm
 # guile -s ../src/libgnomecanvas/examples/canvas.scm
 

diff --git a/configure.in b/configure.in
index 4290614d1add3b024e1a4c09c71a3c892bf2cdb1..fd4387871fdcd59908866f938baf286295bf8dc0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -111,8 +111,11 @@ STEPMAKE_PERL(OPTIONAL)
 
 
 
-# new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.7)
+# New makeinfo for multi-page website docs Simply always require new
+# makeinfo should avoid bug reports; if people want to build lily
+# without the docs, they can find this comment and use an older
+# makeinfo -- but hopefully won't report makeinfo problems.
+STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
 AC_SUBST(MAKEINFO_VERSION)
 
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 0eb5ed6ce1b5611908108cf1a485b5100bfa762c..2758563af29e81ae663d45ad753591c36cc3ed9b 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -24,12 +24,25 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
     ##
     ## -V: Workaround for python
-    ##
-    ## Assume, and hunt for, dotted version multiplet.
 
     changequote(<<, >>)dnl
-    ("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' | head -n 1 | \
-       sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/'
+    ##set -x
+    ## Assume and hunt for dotted version multiplet.
+    ## use eval trickery, because we cannot use multi-level $() instead of ``
+    ## for compatibility reasons.
+    ## FIXME: what systems still do not have $() in /bin/sh?
+    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \
+        | head -n 1 \
+       | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
+           -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+    if test -z "$_ver"; then
+        ## If empty, try date [fontforge]
+        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
+           | head -n 1 \
+           | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+    fi
+    echo "$_ver"
+    ##set +x
     changequote([, ])dnl
 ])
 
@@ -84,13 +97,18 @@ AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [
 
 
 # Check version of program ($1)
-# If version is smaller than requested ($3),
-# add entry to missing-list ($2, one of 'OPTIONAL', 'REQUIRED').
+# If version ($4: optional argument, supply if version cannot be
+# parsed using --version or -V ) is smaller than requested ($3), add
+# entry to missing-list ($2, one of 'OPTIONAL', 'REQUIRED').
 AC_DEFUN(STEPMAKE_CHECK_VERSION, [
     r="`eval echo '$'"$1"`"
     AC_MSG_CHECKING([$r version])
     exe=`STEPMAKE_GET_EXECUTABLE($r)`
-    ver=`STEPMAKE_GET_VERSION($exe)`
+    if test -n "$4"; then
+        ver="$4"
+    else
+        ver=`STEPMAKE_GET_VERSION($exe)`
+    fi
     num=`STEPMAKE_NUMERIC_VERSION($ver)`
     req=`STEPMAKE_NUMERIC_VERSION($3)`
     AC_MSG_RESULT([$ver])