Remove -L/usr/lib from a couple more make variables.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 14 Mar 2009 23:54:55 +0000 (00:54 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 14 Mar 2009 23:54:55 +0000 (00:54 +0100)
lib/util/fault.m4
source4/auth/config.m4
source4/build/m4/public.m4
source4/torture/local/config.mk

index da077af31da91dd9c156cf14c8b2e076fab7e8ef..bac553a1583c3dd63522ee2a7658766073f61240 100644 (file)
@@ -8,6 +8,7 @@ if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x
        EXECINFO_CFLAGS="$CFLAGS"
        EXECINFO_CPPFLAGS="$CPPFLAGS"
        EXECINFO_LDFLAGS="$LDFLAGS"
+       LIB_REMOVE_USR_LIB(EXECINFO_LDFLAGS)
 else
        SMB_ENABLE(EXECINFO,NO)
 fi
index a271a9f6fe4c8eca6e4e6486689bac29a1d0ac55..fb9ee58c60faeef47b527fb2b4374c826150deb4 100644 (file)
@@ -27,6 +27,7 @@ if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_cli
        SASL_CFLAGS="$CFLAGS"
        SASL_CPPFLAGS="$CPPFLAGS"
        SASL_LDFLAGS="$LDFLAGS"
+       LIB_REMOVE_USR_LIB(SASL_LDFLAGS)
 else
        SMB_ENABLE(cyrus_sasl,NO)
 fi
index ffdf92f78444a100315be4579b8f4a8e607ceb62..6860e56e7fc1f41c5f9046780aee9f6f450136c2 100644 (file)
@@ -99,11 +99,13 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
                                        AC_MSG_WARN([cannot run when cross-compiling]))
                                CFLAGS="$OLD_CFLAGS"
 
+                               ac_cv_$1_libs_only_other="`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`"
+                               LIB_REMOVE_USR_LIB(ac_cv_$1_libs_only_other)
                                SMB_EXT_LIB($1, 
                                        [`$PKG_CONFIG --libs-only-l '$2'`], 
                                        [`$PKG_CONFIG --cflags-only-other '$2'`],
                                        [`$PKG_CONFIG --cflags-only-I '$2'`],
-                                       [`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`])
+                                       [$ac_cv_$1_libs_only_other])
                                ac_cv_$1_found=yes
 
                        else
index e13056190a2e024eda8c125946ff3ae8133329cb..967e545225a53fc029e80bcbd8d34adeed43e9a9 100644 (file)
@@ -44,7 +44,7 @@ TORTURE_LOCAL_OBJ_FILES = \
                $(torturesrcdir)/../../lib/compression/testsuite.o \
                $(torturesrcdir)/../../lib/util/charset/tests/charset.o \
                $(torturesrcdir)/../libcli/security/tests/sddl.o \
-               ../lib/tdr/testsuite.o \
+               $(libtdrsrcdir)/testsuite.o \
                $(torturesrcdir)/../../lib/tevent/testsuite.o \
                $(torturesrcdir)/../param/tests/share.o \
                $(torturesrcdir)/../param/tests/loadparm.o \