From 7ecb9f6de57913f350d4bf1541ccdffa3fb5e4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 31 Aug 2004 16:01:10 +0000
Subject: [PATCH] no -lbfd for --disable-stacktrace

---
 configure.in | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index 1561876..f88630e 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.7  2004/08/31 16:01:10  marc
+## no -lbfd for --disable-stacktrace
+##
 ## Revision 1.6  2004/08/28 16:21:07  marc
 ## mrw-c++-0.92 (mrw)
 ## - new file: version.cpp
@@ -27,7 +30,7 @@
 AC_INIT([mrw/mrw.hpp.in])
 PACKAGENAME=mrw-c++
 MAJOR=0
-MINOR=92
+MINOR=93
 SUPPORT=
 AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@, [marc@waeckerlin.org])
 
@@ -55,17 +58,11 @@ AC_CHECK_HEADER(sys/old_procfs.h, [AM_CPPFLAGS=-D__solaris__])
 
 # libraries
 AC_CHECK_HEADER(log4cxx/logger.h, [have_log4cxx=yes])
-AC_SEARCH_LIBS(cplus_demangle, iberty, [AC_MSG_RESULT([OK])],
-               [AC_MSG_ERROR([Library iberty is required!])])
-AC_SEARCH_LIBS(bfd_arch_list, bfd, [AC_MSG_RESULT([OK])],
-               [ac_cv_search_bfd_arch_list=;
-               ]AC_SEARCH_LIBS(bfd_arch_list, bfd, [AC_MSG_RESULT([OK])],
-                 [AC_MSG_ERROR([BFD library libbfd is required])], [-lintl]))
 
 # Arguments
 AM_MAINTAINER_MODE
 AC_ARG_ENABLE(pedantic,
-  [  --enable-pedantic     enable all warnings and checks, abort on warnings],
+  [  --enable-pedantic       enable all warnings and checks, abort on warnings],
   [test "$enableval" = "yes" &&  \
      AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"])
 dnl problem in libs: -Wshadow -Wcast-qual
@@ -85,6 +82,14 @@ AC_ARG_ENABLE(stacktrace,
                           you still want to use the other parts],
   [have_stacktrace="$enableval"], [have_stacktrace="yes"])
 AM_CONDITIONAL(HAVE_STACKTRACE, test "$have_stacktrace" = "yes")
+if [ "$have_stacktrace" = "yes" ]; then
+  AC_SEARCH_LIBS(cplus_demangle, iberty, [AC_MSG_RESULT([OK])],
+                 [AC_MSG_ERROR([Library iberty is required!])])
+  AC_SEARCH_LIBS(bfd_arch_list, bfd, [AC_MSG_RESULT([OK])],
+                 [ac_cv_search_bfd_arch_list=;
+                 ]AC_SEARCH_LIBS(bfd_arch_list, bfd, [AC_MSG_RESULT([OK])],
+                   [AC_MSG_ERROR([BFD library libbfd is required])], [-lintl]))
+fi
 
 # export macros
 AC_SUBST(HAVE_DOT)