diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-11-18 16:52:58 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2008-11-18 17:43:51 -0800 |
| commit | 1115b7b342fe8749a385c5c4e213b8d2520f6c84 (patch) | |
| tree | c1cc7b93910f40df9d5eccebd419725b69dd6777 | |
| parent | 314e5cfa7ff9d4decb7edaed42b7cbe0ad5a7b3c (diff) | |
| download | samba-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.
| -rw-r--r-- | lib/util/fault.m4 | 14 | ||||
| -rw-r--r-- | source4/auth/config.m4 | 6 |
2 files changed, 17 insertions, 3 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}]) diff --git a/source4/auth/config.m4 b/source4/auth/config.m4 index 1338b775ec..a271a9f6fe 100644 --- a/source4/auth/config.m4 +++ b/source4/auth/config.m4 @@ -20,11 +20,15 @@ AC_CHECK_FUNCS(crypt16 getauthuid getpwanam) AC_CHECK_HEADERS(sasl/sasl.h) AC_CHECK_LIB_EXT(sasl2, SASL_LIBS, sasl_client_init) -SMB_EXT_LIB(SASL, $SASL_LIBS) if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then SMB_ENABLE(SASL,YES) SMB_ENABLE(cyrus_sasl,YES) + SASL_CFLAGS="$CFLAGS" + SASL_CPPFLAGS="$CPPFLAGS" + SASL_LDFLAGS="$LDFLAGS" else SMB_ENABLE(cyrus_sasl,NO) fi + +SMB_EXT_LIB(SASL, $SASL_LIBS, [${SASL_CFLAGS}], [${SASL_CPPFLAGS}], [${SASL_LDFLAGS}]) |