summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-15 00:54:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-15 00:54:55 +0100
commit7972d82436f5d93606fb538be180250f2f28de6b (patch)
treefb27ad4dce4f1119a65b41869f73ad1407814298
parent3eede51ecbccba8de6ee5380cd8db084b91f7512 (diff)
downloadsamba-7972d82436f5d93606fb538be180250f2f28de6b.tar.gz
samba-7972d82436f5d93606fb538be180250f2f28de6b.tar.bz2
samba-7972d82436f5d93606fb538be180250f2f28de6b.zip
Remove -L/usr/lib from a couple more make variables.
-rw-r--r--lib/util/fault.m41
-rw-r--r--source4/auth/config.m41
-rw-r--r--source4/build/m4/public.m44
-rw-r--r--source4/torture/local/config.mk2
4 files changed, 6 insertions, 2 deletions
diff --git a/lib/util/fault.m4 b/lib/util/fault.m4
index da077af31d..bac553a158 100644
--- a/lib/util/fault.m4
+++ b/lib/util/fault.m4
@@ -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
diff --git a/source4/auth/config.m4 b/source4/auth/config.m4
index a271a9f6fe..fb9ee58c60 100644
--- a/source4/auth/config.m4
+++ b/source4/auth/config.m4
@@ -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
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index ffdf92f784..6860e56e7f 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -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
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index e13056190a..967e545225 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -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 \