patch::: 1.1.7.jcn1

pl7.jcn1
	- configure/guile fixes (still no check for 1.2/1.3)

diff --git a/NEWS b/NEWS
index 129bd32d4fa70ef4b48b30f4adf47d78ca819426..7376da345800a5a7eedcb5de12abbeea901ca5eb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+pl7.jcn1
+       - configure/guile fixes (still no check for 1.2/1.3)
+
 pl6.jcn5
        - repeatbars, volta-spanner work, alternative iteration still broken
        - volta symbol

diff --git a/VERSION b/VERSION
index af5d5f04490dc312df74683828b667b51d7e5fd6..3a9d8453c5accc2e0a9ae78630e814c7c140688e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=7
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index 2cfcf89d0266e1e50bd66ffbf1eb27ed7dfe2aa8..46b9e1839eecc088acb67b1fe009ca9d39cd9dc0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -156,10 +156,12 @@ AC_DEFUN(AC_STEPMAKE_GXX, [
 ])
 
 AC_DEFUN(AC_STEPMAKE_GUILE, [
+    # on some systems, -lguile succeeds for guile-1.3
+    # others need readline, dl (or even more)
     # urg, must check for different functions in libguile
     # to force new check iso reading from cache
     AC_CHECK_LIB(guile, scm_shell, \
-      LIBS="-lguile $LIBS" AC_DEFINE(HAVE_LIBGUILE), \
+      LIBS="-lguile $LIBS"; AC_DEFINE(HAVE_LIBGUILE), \
       AC_CHECK_LIB(readline, readline) \
       AC_CHECK_LIB(dl, dlopen) \
       AC_CHECK_LIB(socket, socket)\
@@ -167,6 +169,10 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
       AC_CHECK_LIB(m, fabs)\
       AC_CHECK_LIB(guile, scm_boot_guile)\
     )
+    if test "$ac_cv_lib_guile_scm_shell" != yes -a \
+      "$ac_cv_lib_scm_boot_guile" != yes ; then
+           AC_STEPMAKE_WARN(You should install guile 1.3 or newer)
+    fi
 ])
 
 AC_DEFUN(AC_STEPMAKE_INIT, [
@@ -325,8 +331,8 @@ AC_DEFUN(AC_STEPMAKE_LEXYACC, [
 
     AC_CHECK_PROGS(BISON, bison, error)
     AC_CHECK_PROGS(FLEX, flex, error)
-    AC_CHECK_SEARCH_RESULT($BISON, bison,  Please install Bison, 1.25 or better)
-    AC_CHECK_SEARCH_RESULT($FLEX,  flex, Please install Flex, 2.5 or better)
+    AC_CHECK_SEARCH_RESULT($BISON, bison,  Please install Bison, 1.25 or newer)
+    AC_CHECK_SEARCH_RESULT($FLEX,  flex, Please install Flex, 2.5 or newer)
 
     if test $BISON != "error"; then
        bison_version=`$BISON --version| sed 's/^.*version 1.//g' `
@@ -851,7 +857,7 @@ main ()
        echo "*** full path to gtk-config."
        echo "*** The gtkmm-config script was not available in GTK-- versions"
        echo "*** prior to 0.9.12. Perhaps you need to update your installed"
-       echo "*** version to 0.9.12 or later"
+       echo "*** version to 0.9.12 or newer"
      else
        if test -f conf.gtkmmtest ; then
         :

diff --git a/configure.in b/configure.in
index 044e0d5e6a02069decde0cdb76b9048b44c7f987..4f251a61fe109d0579dd3fd67b4e401d5a3e42fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -54,7 +54,7 @@ AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
 AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
 AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl,  
-    You should install Yodl 1.30.2 or better)
+    You should install Yodl 1.30.2 or newer)
 
 AC_STEPMAKE_END
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 102e364f9985d4348b05f6649bfc781ffb954a6e..ab45326524543cc2cf215b03b70e25aca66570e6 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -154,10 +154,12 @@ AC_DEFUN(AC_STEPMAKE_GXX, [
 ])
 
 AC_DEFUN(AC_STEPMAKE_GUILE, [
+    # on some systems, -lguile succeeds for guile-1.3
+    # others need readline, dl (or even more)
     # urg, must check for different functions in libguile
     # to force new check iso reading from cache
     AC_CHECK_LIB(guile, scm_shell, \
-      LIBS="-lguile $LIBS" AC_DEFINE(HAVE_LIBGUILE), \
+      LIBS="-lguile $LIBS"; AC_DEFINE(HAVE_LIBGUILE), \
       AC_CHECK_LIB(readline, readline) \
       AC_CHECK_LIB(dl, dlopen) \
       AC_CHECK_LIB(socket, socket)\
@@ -165,6 +167,10 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
       AC_CHECK_LIB(m, fabs)\
       AC_CHECK_LIB(guile, scm_boot_guile)\
     )
+    if test "$ac_cv_lib_guile_scm_shell" != yes -a \
+      "$ac_cv_lib_scm_boot_guile" != yes ; then
+           AC_STEPMAKE_WARN(You should install guile 1.3 or newer)
+    fi
 ])
 
 AC_DEFUN(AC_STEPMAKE_INIT, [
@@ -323,8 +329,8 @@ AC_DEFUN(AC_STEPMAKE_LEXYACC, [
 
     AC_CHECK_PROGS(BISON, bison, error)
     AC_CHECK_PROGS(FLEX, flex, error)
-    AC_CHECK_SEARCH_RESULT($BISON, bison,  Please install Bison, 1.25 or better)
-    AC_CHECK_SEARCH_RESULT($FLEX,  flex, Please install Flex, 2.5 or better)
+    AC_CHECK_SEARCH_RESULT($BISON, bison,  Please install Bison, 1.25 or newer)
+    AC_CHECK_SEARCH_RESULT($FLEX,  flex, Please install Flex, 2.5 or newer)
 
     if test $BISON != "error"; then
        bison_version=`$BISON --version| sed 's/^.*version 1.//g' `
@@ -849,7 +855,7 @@ main ()
        echo "*** full path to gtk-config."
        echo "*** The gtkmm-config script was not available in GTK-- versions"
        echo "*** prior to 0.9.12. Perhaps you need to update your installed"
-       echo "*** version to 0.9.12 or later"
+       echo "*** version to 0.9.12 or newer"
      else
        if test -f conf.gtkmmtest ; then
         :

diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make
index 4fac9bc0a0a6f5047a6b90b3a8940d3838389a7b..6db8e29491e2cee49f8f7577a7cefb005b7e96d6 100644 (file)
--- a/stepmake/stepmake/package.make
+++ b/stepmake/stepmake/package.make
@@ -17,8 +17,8 @@ deb:
          dpkg-buildpackage -b; \
        )'
 
-makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%)))
-# makeflags=$(patsubst %==, %, $(patsubst ----%,%,$($(MAKEFLAGS:%=--%):--unix=)))
+# makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%)))
+makeflags=$(patsubst %==, %, $(patsubst %----,%,$($(MAKEFLAGS:%=--%):--unix=)))
 
 diff:
        $(PYTHON) $(step-bindir)/package-diff.py --package=$(topdir) $(makeflags)