From 1f15efbdc694b6689e898b235c855a08943d7221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 28 Feb 2005 08:00:21 +0000 Subject: [PATCH] check for libtool --- configure.in | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index b0e67db..9f7cdaa 100644 --- a/configure.in +++ b/configure.in @@ -12,8 +12,8 @@ # init AC_INIT([mrw/mrw.hpp.in]) PACKAGENAME=mrw-c++ -m4_define(x_major, 1) -m4_define(x_minor, 9) +m4_define(x_major, 2) +m4_define(x_minor, 0) m4_define(x_least, 0) AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org]) @@ -56,6 +56,7 @@ AC_CHECK_HEADER(sys/old_procfs.h, [AM_CPPFLAGS=-D__solaris__]) # libraries AC_CHECK_HEADER(log4cxx/logger.h, [have_log4cxx=yes]) +AC_CHECK_HEADER(ltdl.h, [have_ltdl=yes]) # Arguments AM_MAINTAINER_MODE @@ -87,11 +88,16 @@ AC_ARG_ENABLE(log4cxx, stack trace], [have_log4cxx="$enableval"]) AM_CONDITIONAL(HAVE_LOG4CXX, test "$have_log4cxx" = "yes") +AC_ARG_ENABLE(ltdl, + [ --disable-ltdl disable use of libtool library dynamic loading + Note: For automated stack trace, you need ltdl], + [have_ltdl="$enableval"]) +AM_CONDITIONAL(HAVE_LTDL, test "$have_ltdl" = "yes") AC_ARG_ENABLE(stacktrace, [ --disable-stacktrace disable stack trace, use this if you cannot compile the library on your system otherwise and you still want to use the other parts], - [have_stacktrace="$enableval"], [have_stacktrace="yes"]) + [have_stacktrace="$enableval"], [have_stacktrace=$have_ltdl]) AM_CONDITIONAL(HAVE_STACKTRACE, test "$have_stacktrace" = "yes") if test "$have_stacktrace" = "yes"; then AC_SEARCH_LIBS(cplus_demangle, [demangle iberty], @@ -140,3 +146,8 @@ AC_MSG_WARN([Library log4cxx will not be used! http://logging.apache.org/log4cxx]); fi if test "$have_stacktrace" != "yes"; then AC_MSG_WARN([mrw::StackTrace is disabled!]); fi +if test "$have_ltdl" != "yes"; then +AC_MSG_ERROR([mrw::DynamicLibrary dynamic library loading is disabled! + - mrw::StackTrace is disabled without mrw::DynamicLibrary + - install the GNU libtool, if you need mrw::DynamicLibrary]); +fi