--- configure.ac | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 993087d..c6e6d5b 100644 --- a/configure.ac +++ b/configure.ac @@ -117,18 +117,12 @@ if test "x$CONFIG_RUSAGE" = "xno"; then fi dnl We need to have Bruno Haible's CLN installed. -dnl (CLN versions >= 1.1.0 must have installed cln.m4 at a visible place, -dnl which provides this macro): -AC_PATH_CLN(1.1.0, [ - LIBS="$LIBS $CLN_LIBS" - CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" -], GINAC_ERROR([No suitable installed version of CLN could be found.])) - -dnl Expand the cppflags and libraries needed by apps using GiNaC -GINACLIB_CPPFLAGS=$CPPFLAGS -GINACLIB_LIBS=$LIBS -AC_SUBST(GINACLIB_CPPFLAGS) -AC_SUBST(GINACLIB_LIBS) +dnl (pkg-config must have installed pkg.m4 at a visible place, which provides +dnl this macro. CLN >= 1.1.13 must have installed cln.pc at a visible place, +dnl which provides the actual dependency info +PKG_CHECK_MODULES(CLN, cln >= 1.1.13) +LIBS="$LIBS $CLN_LIBS" +CPPFLAGS="$CPPFLAGS $CLN_CFLAGS" dnl Check for utilities needed by the different kinds of documentation. dnl Documentation needs only be built when extending it, so never mind if it -- 1.4.4.4 -- All science is either physics or stamp collecting.