* config.make.in (HAVE_LIBKPATHSEA_SO):

* stepmake/aclocal.m4: Also subst HAVE_LIBKPATHSEA_SO.

* lily/GNUmakefile (MODULE_LDFLAGS): Only if not HAVE_KPATHSEA_SO,
add KPATHSEA_LIBS.

diff --git a/ChangeLog b/ChangeLog
index f07e7efe4a9ba2c296859826fa59067f6ddeb611..39615eae012042e2ddb8fa7b9c2234598d74c499 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-03-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * config.make.in (HAVE_LIBKPATHSEA_SO): 
+       * stepmake/aclocal.m4: Also subst HAVE_LIBKPATHSEA_SO.
+
+       * lily/GNUmakefile (MODULE_LDFLAGS): Only if not HAVE_KPATHSEA_SO,
+       add KPATHSEA_LIBS.
+
        * debian/watch: 
        * debian/control: Update.
 

diff --git a/config.make.in b/config.make.in
index c6604aa68cd61c2316f5965451c728e39acaf6aa..b8705376afdb9a6386739b36b2a35579a4019d26 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -16,6 +16,8 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
+HAVE_LIBKPATHSEA_SO = @HAVE_LIBKPATHSEA_SO@
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index c828a185854e33a8f1e02b72c0392026cae46cfa..9569aa5023d13a85383c8fd226663811c88a2211 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -6,9 +6,11 @@ SUBDIRS = include
 
 MODULE_LIBS= $(depth)/flower  $(depth)/ttftool $(depth)/kpath-guile 
 MODULE_INCLUDES= $(depth)/flower/include $(depth)/ttftool/include 
-MODULE_CXXFLAGS= 
-MODULE_LDFLAGS= $(KPATHSEA_LIBS)
+MODULE_CXXFLAGS=
 
+ifeq ($(HAVE_LIBKPATHSEA_SO),no)
+MODULE_LDFLAGS= $(KPATHSEA_LIBS)
+endif
 
 HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES= c++ executable po help2man

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index f35171e6f2f1984055dff6a4f3c5eb7b0dd3bda4..d4c59bacc95e98622991f490d1f9954f916cce11 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -827,6 +827,7 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
 
     AC_SUBST(KPATHSEA)
     AC_SUBST(KPATHSEA_LIBS)
+    AC_SUBST(HAVE_LIBKPATHSEA_SO, $have_libkpathsea_so)
     AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA)
 ])