From 22bf8270163ec9ec11f37c79957e18d6e6e163cd Mon Sep 17 00:00:00 2001 From: Jens Vollinga Date: Thu, 6 Nov 2008 14:18:01 +0100 Subject: [PATCH] Stupid error: did the revert on the wrong branch (master instead of ginac_1-4). Revert "Revert "[portability] GiNaC::compile_ex works on OpenBSD now."" This reverts commit a6854a8a0f1e5db722320f5d7ccb9097053500cf. --- acinclude.m4 | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 78c3bdb7..06ac032a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -187,16 +187,29 @@ case $host_os in esac if test "$CONFIG_EXCOMPILER" = "yes"; then - AC_CHECK_LIB(dl, dlopen, [ - DL_LIBS="-ldl" - AC_DEFINE(HAVE_LIBDL, 1, [set to 1 if you have a working libdl installed.])], - - [AC_MSG_WARN([libdl not found. GiNaC::compile_ex will be disabled.]) - CONFIG_EXCOMPILER="no"]) + AC_CHECK_HEADER([dlfcn.h], [CONFIG_EXCOMPILER="yes"], [CONFIG_EXCOMPILER="no"]) elif test "$CONFIG_EXCOMPILER" = "no"; then - AC_MSG_RESULT([INFO: GiNaC::compile_ex disabled at user request.]) + AC_MSG_NOTICE([GiNaC::compile_ex disabled at user request.]) else - AC_MSG_RESULT([INFO: GiNaC::compile_ex is not supported on $host_os.]) + AC_MSG_NOTICE([GiNaC::compile_ex is not supported on $host_os.]) +fi + +if test "$CONFIG_EXCOMPILER" = "yes"; then + dnl Some systems (GNU/Linux, Solaris) have dlopen in -ldl, some + dnl others (OpenBSD) -- in libc + found_dlopen_lib="no" + DL_LIBS="-ldl" + AC_CHECK_LIB(dl, dlopen, [found_dlopen_lib="yes"]) + if test "$found_dlopen_lib" = "no"; then + DL_LIBS="" + AC_CHECK_FUNC(dlopen, [found_dlopen_lib="yes"]) + fi + if test "$found_dlopen_lib" = "no"; then + CONFIG_EXCOMPILER="no" + AC_MSG_WARN([Could not found working dlopen(). GiNaC::compile_ex will be disabled.]) + else + AC_DEFINE(HAVE_LIBDL, 1, [set to 1 if dlopen() works.]) + fi fi AC_SUBST(DL_LIBS) AC_SUBST(CONFIG_EXCOMPILER)]) -- 2.44.0