s3 build: when detecting to use internal zlib, put "-I../lib/zlib" first in CFLAGS

[kai/samba.git] / source3 / configure.in

diff --git a/source3/configure.in b/source3/configure.in
index 1adb56ad91e2a88acb6d51664c47bdf9316fdc32..9214d031b3d496c693245f3b41b52ab478542739 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1033,6 +1033,8 @@ AC_CHECK_FUNCS(gettext dgettext)
 
 # Find a method of generating a stack trace
 AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
+# libexecinfo provides backtrace_symbols on FreeBSD
+AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 AC_CHECK_FUNCS(backtrace_symbols)
 AC_CHECK_LIB(exc, trace_back_stack)
 
@@ -6254,7 +6256,7 @@ AC_ZLIB([ZLIB_OBJS=""], [
        do
                ZLIB_OBJS="$ZLIB_OBJS ../lib/zlib/$o"
        done
-       CFLAGS="$CFLAGS -I../lib/zlib"
+       CFLAGS="-I../lib/zlib $CFLAGS"
 ])
 
 dnl Remove -L/usr/lib/? from LDFLAGS and LIBS