added libcwd; refs #9
This commit is contained in:
11
configure.in
11
configure.in
@@ -99,7 +99,7 @@ AC_SUBST_FILE(README)
|
|||||||
CHANGE_LOG=ChangeLog
|
CHANGE_LOG=ChangeLog
|
||||||
AC_SUBST_FILE(CHANGE_LOG)
|
AC_SUBST_FILE(CHANGE_LOG)
|
||||||
|
|
||||||
AM_CPPFLAGS="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'"
|
AM_CPPFLAGS="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"' -I/usr/include/libcwd"
|
||||||
|
|
||||||
# Get rid of that stupid -O2 -g opions!
|
# Get rid of that stupid -O2 -g opions!
|
||||||
CXXFLAGS="${CXXFLAGS:-}"
|
CXXFLAGS="${CXXFLAGS:-}"
|
||||||
@@ -200,14 +200,15 @@ if test "$have_stacktrace" = "yes"; then
|
|||||||
[AC_MSG_WARN([Header "demangle.h" from the binutils not found!
|
[AC_MSG_WARN([Header "demangle.h" from the binutils not found!
|
||||||
- unfortunately, the bintils do not install this header
|
- unfortunately, the bintils do not install this header
|
||||||
(even though they should)
|
(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
|
- 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
|
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],
|
AC_SEARCH_LIBS(cplus_demangle, [demangle iberty_pic iberty cwd],
|
||||||
[AC_MSG_RESULT([OK, found cplus_demangle])],
|
[AC_MSG_RESULT([OK, found cplus_demangle])],
|
||||||
[AC_MSG_ERROR([Function cplus_demangle not found!
|
[AC_MSG_ERROR([Function cplus_demangle not found!
|
||||||
- I looked in libdemangle and libiberty
|
- I looked in libdemangle, libiberty and libcwd
|
||||||
- Try "ls -l /usr/lib/libdemangle* /usr/lib/libiberty*"
|
- Try "ls -l /usr/lib/libdemangle* /usr/lib/libiberty* /usr/lib/libcwd*"
|
||||||
- is one of them installed?
|
- is one of them installed?
|
||||||
- If yes, try: "nm <filename> | grep cplus_demangle"
|
- If yes, try: "nm <filename> | grep cplus_demangle"
|
||||||
-> is the symbol defined?
|
-> is the symbol defined?
|
||||||
@@ -302,6 +303,8 @@ AC_SUBST(PACKAGENAME)
|
|||||||
AC_SUBST(AM_CXXFLAGS)
|
AC_SUBST(AM_CXXFLAGS)
|
||||||
AC_SUBST(AM_CPPFLAGS)
|
AC_SUBST(AM_CPPFLAGS)
|
||||||
AC_SUBST(LIBS)
|
AC_SUBST(LIBS)
|
||||||
|
DISTCHECK_CONFIGURE_FLAGS="$(env)"
|
||||||
|
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
|
||||||
|
|
||||||
# create output
|
# create output
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
@@ -8,6 +8,7 @@
|
|||||||
#ifndef __MRW__CHECKCXX11__
|
#ifndef __MRW__CHECKCXX11__
|
||||||
#define __MRW__CHECKCXX11__
|
#define __MRW__CHECKCXX11__
|
||||||
|
|
||||||
|
|
||||||
// check if code is compiled with a new C++11 compiler
|
// check if code is compiled with a new C++11 compiler
|
||||||
// otherwise there is a fallback wich makes everything much more compliacted
|
// otherwise there is a fallback wich makes everything much more compliacted
|
||||||
# ifndef MRW__OLD_PRE11_COMPILER
|
# ifndef MRW__OLD_PRE11_COMPILER
|
||||||
|
@@ -188,4 +188,5 @@ endif
|
|||||||
check_PROGRAMS = $(VALGRIND_CHECKS) $(NO_VALGRIND_CHECKS)
|
check_PROGRAMS = $(VALGRIND_CHECKS) $(NO_VALGRIND_CHECKS)
|
||||||
|
|
||||||
CLEANFILES =
|
CLEANFILES =
|
||||||
|
DISTCLEANFILES = configfile2.ini
|
||||||
MAINTAINERCLEANFILES = makefile.in
|
MAINTAINERCLEANFILES = makefile.in
|
||||||
|
Reference in New Issue
Block a user