[Pkg-voip-commits] [bctoolbox] 12/57: Fix compilation of bctoolbox

[daniel at gnoutcheff.name]

This is an automated email from the git hooks/post-receive script.

gnoutchd-guest pushed a commit to branch debian/sid
in repository bctoolbox.

commit 45cc76568da3d76ae2ca0d09e36dec303fe65517
Author: Simon Morlat <simon.morlat at linphone.org>
Date:   Sat Nov 19 10:31:55 2016 +0100

    Fix compilation of bctoolbox
---
 configure.ac                  | 4 +++-
 include/CMakeLists.txt        | 2 +-
 include/bctoolbox/Makefile.am | 2 +-
 src/Makefile.am               | 7 ++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 69f96e4..2d18d5e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,8 @@ else
 	CFLAGS="$CFLAGS -g"
 fi
 
+CXXFLAGS="$CXXFLAGS -std=c++11"
+
 AC_ARG_ENABLE(strict,
 		[  --enable-strict    Turn on strict mode compilation, no warnings allowed (default=yes)],
 		[case "${enableval}" in
@@ -203,7 +205,7 @@ case $host in
 	;;
 	*)
 		CFLAGS="$CFLAGS -pthread -D_REENTRANT"
-		CXXFLAGS="$CFLAGS -pthread -D_REENTRANT"
+		CXXFLAGS="$CXXFLAGS -pthread -D_REENTRANT"
 		LIBS="$LIBS -pthread -lpthread"
 	;;
 esac
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 86f230d..b38bde2 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -32,7 +32,7 @@ if(ENABLE_TESTS_COMPONENT)
 	list(APPEND HEADER_FILES tester.h)
 endif()
 if(HAVE_EXECINFO) 
-	list(APPEND HEADER_FILES exception.h)
+	list(APPEND HEADER_FILES exception.hh)
 endif()
 
 set(BCTOOLBOX_HEADER_FILES )
diff --git a/include/bctoolbox/Makefile.am b/include/bctoolbox/Makefile.am
index f7a745e..79f91a4 100644
--- a/include/bctoolbox/Makefile.am
+++ b/include/bctoolbox/Makefile.am
@@ -1,5 +1,5 @@
 bctoolboxdir=$(includedir)/bctoolbox
 
-bctoolbox_HEADERS=tester.h crypto.h map.h list.h port.h logging.h vfs.h
+bctoolbox_HEADERS=tester.h crypto.h map.h list.h port.h logging.h vfs.h exception.hh
 
 EXTRA_DIST=$(bctoolbox_HEADERS)
diff --git a/src/Makefile.am b/src/Makefile.am
index cb396e8..2798354 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,12 @@
 
 lib_LTLIBRARIES=libbctoolbox.la libbctoolbox-tester.la
 
-libbctoolbox_la_SOURCES= vfs.c utils/port.c logging/logging.c containers/list.c containers/map.cc
+libbctoolbox_la_SOURCES= vfs.c \
+					utils/port.c \
+					utils/exception.cc \
+					logging/logging.c \
+					containers/list.c \
+					containers/map.cc
 
 if ENABLE_POLARSSL
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bctoolbox.git