From b9e36e6f4c37c78ab0f6794a5748c329df653760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 22 Apr 2014 08:22:08 +0000
Subject: [PATCH] added libcwd - next try; refs #9

---
 configure.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 0b30653..946565c 100644
--- a/configure.in
+++ b/configure.in
@@ -99,7 +99,7 @@ AC_SUBST_FILE(README)
 CHANGE_LOG=ChangeLog
 AC_SUBST_FILE(CHANGE_LOG)
 
-AM_CPPFLAGS="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"' -I/usr/include/libcwd"
+AM_CPPFLAGS="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'"
 
 # Get rid of that stupid -O2 -g opions!
 CXXFLAGS="${CXXFLAGS:-}"
@@ -127,7 +127,7 @@ AC_CHECK_HEADERS(unistd.h fcntl.h, [have_exec=yes])
 AC_CHECK_HEADER(dirent.h, [have_dir=yes])
 
 # solaris?
-AC_CHECK_HEADER(sys/old_procfs.h, [AM_CPPFLAGS=-D__solaris__])
+AC_CHECK_HEADER(sys/old_procfs.h, [AM_CPPFLAGS="$AM_CPPFLAGS -D__solaris__"])
 
 # Arguments
 AM_MAINTAINER_MODE
@@ -197,13 +197,17 @@ if test "$have_stacktrace" = "yes"; then
   # } bug
   AC_CHECK_HEADER([demangle.h],
                   [AC_DEFINE([HAVE_DEMANGLE_H])],
-                  [AC_MSG_WARN([Header "demangle.h" from the binutils not found!
+                  [AC_CHECK_HEADER([libcwd/demangle.h],
+                                   [AC_DEFINE([HAVE_DEMANGLE_H])
+                                    AM_CPPFLAGS="$AM_CPPFLAGS -I/usr/include/libcwd"],
+                                   [AC_MSG_WARN(
+[Header "demangle.h" from the binutils not found!
  - unfortunately, the bintils do not install this header
    (even though they should)
  - if available, install package libcwd (Ubuntu since 13.04 Trusty)
  - the required symbols are now declared in stacktrace.cxx according to my
    own binutils version (binutils-2.16.1) it may or may not be compatible to
-   yours])])
+   yours])])])
   AC_SEARCH_LIBS(cplus_demangle, [demangle iberty_pic iberty cwd],
                  [AC_MSG_RESULT([OK, found cplus_demangle])],
 [AC_MSG_ERROR([Function cplus_demangle not found!