summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2008-11-18 16:52:58 -0800
committerTim Prouty <tprouty@samba.org>2008-11-18 17:43:51 -0800
commit1115b7b342fe8749a385c5c4e213b8d2520f6c84 (patch)
treec1cc7b93910f40df9d5eccebd419725b69dd6777 /lib/util
parent314e5cfa7ff9d4decb7edaed42b7cbe0ad5a7b3c (diff)
downloadsamba-1115b7b342fe8749a385c5c4e213b8d2520f6c84.tar.gz
samba-1115b7b342fe8749a385c5c4e213b8d2520f6c84.tar.bz2
samba-1115b7b342fe8749a385c5c4e213b8d2520f6c84.zip
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.
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/fault.m414
1 files changed, 12 insertions, 2 deletions
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}])