X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.ac;h=c90f09d64010f29c3f6a61b71047a1aed9164bfa;hp=576a72bb46cf364fc0adb85f4543ce2bf74871dd;hb=93eb93a10a2f29360baa4ab45d5b34b982c7fa5c;hpb=a3009dfc5402f6253e9219201f48d972dd46984b

diff --git a/configure.ac b/configure.ac
index 576a72bb..c90f09d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,8 @@ m4_define([ginac_binary_age], [0])
 AC_INIT([GiNaC], ginac_version, [<ginac-list@ginac.de>])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(ginac/basic.cpp)
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_HEADERS([config/config.h])
 dnl This defines PACKAGE and VERSION.
 AM_INIT_AUTOMAKE([gnu 1.7 dist-bzip2])
 
@@ -78,6 +79,14 @@ AC_LANG([C++])
 dnl Make sure all the necessary standard headers are installed on the system.
 GINAC_STD_CXX_HEADERS
 
+dnl We need to have Bruno Haible's CLN installed.
+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 data types which are needed by the hash function 
 dnl (golden_ratio_hash).
 AC_CHECK_TYPE(long long)
@@ -87,23 +96,8 @@ AC_CHECK_HEADERS(unistd.h)
 GINAC_HAVE_RUSAGE
 GINAC_READLINE
 
-DL_LIBS=""
 dnl Check for dl library (needed for GiNaC::compile).
-AC_CHECK_LIB(dl, dlopen,
-	[
-		DL_LIBS="-ldl"
-		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_SUBST(DL_LIBS)
-
-dnl We need to have Bruno Haible's CLN installed.
-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"
+GINAC_EXCOMPILER
 
 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