From 977326d20eaa9f7c5641b9f7af6bf607becb2ff7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 28 Mar 2005 14:47:14 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ config.make.in | 2 ++ lily/GNUmakefile | 6 ++++-- stepmake/aclocal.m4 | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f07e7efe4a..39615eae01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-03-28 Jan Nieuwenhuizen + * 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 c6604aa68c..b8705376af 100644 --- 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 c828a18585..9569aa5023 100644 --- 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 f35171e6f2..d4c59bacc9 100644 --- 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) ]) -- 2.39.5