From 1115b7b342fe8749a385c5c4e213b8d2520f6c84 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Tue, 18 Nov 2008 16:52:58 -0800 Subject: s3/s4 build: Fix execinfo and sasl build error when the libs/headers are in non-standard locations. These configure checks have the correct flags at configure time, so let's pass them through so they are used at compile time. --- lib/util/fault.m4 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lib/util') diff --git a/lib/util/fault.m4 b/lib/util/fault.m4 index b24e63641c..da077af31d 100644 --- a/lib/util/fault.m4 +++ b/lib/util/fault.m4 @@ -1,5 +1,15 @@ AC_CHECK_HEADERS(execinfo.h) AC_SEARCH_LIBS_EXT(backtrace, [execinfo], EXECINFO_LIBS) AC_CHECK_FUNC_EXT(backtrace, $EXECINFO_LIBS) -SMB_EXT_LIB(EXECINFO,[${EXECINFO_LIBS}]) -SMB_ENABLE(EXECINFO) + + +if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then + SMB_ENABLE(EXECINFO, YES) + EXECINFO_CFLAGS="$CFLAGS" + EXECINFO_CPPFLAGS="$CPPFLAGS" + EXECINFO_LDFLAGS="$LDFLAGS" +else + SMB_ENABLE(EXECINFO,NO) +fi + +SMB_EXT_LIB(EXECINFO, [${EXECINFO_LIBS}], [${EXECINFO_CFLAGS}], [${EXECINFO_CPPFLAGS}], [${EXECINFO_LDFLAGS}]) -- cgit