* Use pkg-config for detecting CLN, advertise it in the manual and drop

[ginac.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 44356f2770797c76134c64d4b5ce5235e704cf1e..a6fa0664c4e459b58fc047933d7b9fae89a7ae09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -118,29 +118,23 @@ if test "x$CONFIG_RUSAGE" = "xno"; then
     AC_CHECK_HEADER(ctime, , GINAC_ERROR([The standard <ctime> header file could not be found.]))
 fi
 
     AC_CHECK_HEADER(ctime, , GINAC_ERROR([The standard <ctime> header file could not be found.]))
 fi
 

+DL_LIBS=""

 dnl Check for dl library (needed for GiNaC::compile).
 AC_CHECK_LIB(dl, dlopen,
        [
                DL_LIBS="-ldl"
 dnl Check for dl library (needed for GiNaC::compile).
 AC_CHECK_LIB(dl, dlopen,
        [
                DL_LIBS="-ldl"

-               AC_SUBST(DL_LIBS)

                AC_DEFINE(HAVE_LIBDL, 1, [set to 1 if you have a working libdl installed.])
        ], 
        GINAC_WARNING([libdl not found. GiNaC::compile will be disabled.]))
                AC_DEFINE(HAVE_LIBDL, 1, [set to 1 if you have a working libdl installed.])
        ], 
        GINAC_WARNING([libdl not found. GiNaC::compile will be disabled.]))

-LIBS="$LIBS $DL_LIBS"
+AC_SUBST(DL_LIBS)

 
 dnl We need to have Bruno Haible's CLN installed.
 
 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.6 must have installed cln.pc at a visible place,
+dnl which provides the actual dependency information.)
+PKG_CHECK_MODULES(CLN, cln >= 1.1.6)
+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
 
 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


@@ -159,8 +153,6 @@ dnl Output makefiles etc.
 AC_CONFIG_FILES([
 Makefile
 GiNaC.spec
 AC_CONFIG_FILES([
 Makefile
 GiNaC.spec

-ginac-config
-ginac-config.1

 ginac.pc
 ginac/Makefile
 ginac/version.h
 ginac.pc
 ginac/Makefile
 ginac/version.h


@@ -179,7 +171,6 @@ doc/reference/DoxyfileTEX
 doc/reference/DoxyfilePDF
 doc/reference/Doxyfooter
 ])
 doc/reference/DoxyfilePDF
 doc/reference/Doxyfooter
 ])

-AC_CONFIG_COMMANDS([default],[[chmod +x ginac-config]],[[]])

 AC_OUTPUT
 dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING
 GINAC_CHECK_ERRORS
 AC_OUTPUT
 dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING
 GINAC_CHECK_ERRORS