[SCM] Samba Shared Repository - branch master updated - 1115b7b342fe8749a385c5c4e213b8d2520f6c84

[Tim Prouty]

The branch, master has been updated
       via  1115b7b342fe8749a385c5c4e213b8d2520f6c84 (commit)
       via  314e5cfa7ff9d4decb7edaed42b7cbe0ad5a7b3c (commit)
      from  ce44a2032362c6160931663af67e2e2e663b0c63 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1115b7b342fe8749a385c5c4e213b8d2520f6c84
Author: Tim Prouty <tprouty at samba.org>
Date:   Tue Nov 18 16:52:58 2008 -0800

    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.

commit 314e5cfa7ff9d4decb7edaed42b7cbe0ad5a7b3c
Author: Tim Prouty <tprouty at samba.org>
Date:   Tue Nov 18 16:47:23 2008 -0800

    s3/s4 build: Fix makefile expression to work on more systems

-----------------------------------------------------------------------

Summary of changes:
 lib/util/fault.m4            |   14 ++++++++++++--
 source4/auth/config.m4       |    6 +++++-
 source4/build/make/python.mk |    2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/fault.m4 b/lib/util/fault.m4
index b24e636..da077af 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 1338b77..a271a9f 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}])
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk
index e307ba7..67a3e86 100644
--- a/source4/build/make/python.mk
+++ b/source4/build/make/python.mk
@@ -46,7 +46,7 @@ swig:: pythonmods
 .SUFFIXES: _wrap.c .i .py
 
 %_wrap.c %.py: %.i
-	[ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -python -keyword  -I../source4 $<
+	[ "$(SWIG)" = "no" ] || $(SWIG) -O -Wall -python -keyword  -I../source4 $<
 
 realdistclean::
 	@echo "Removing SWIG output files"


-- 
Samba Shared Repository