summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-15 14:57:58 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-15 14:57:58 +0100
commitc223beee2a0bd6922eda4551caec0061c86097f2 (patch)
tree72e0b2ca7144d0d2d5e08e285f9fb02a92cd67ad /source4/build
parent74299582c4989d00a45962836bb02cc7f4b2dd20 (diff)
parent7972d82436f5d93606fb538be180250f2f28de6b (diff)
downloadsamba-c223beee2a0bd6922eda4551caec0061c86097f2.tar.gz
samba-c223beee2a0bd6922eda4551caec0061c86097f2.tar.bz2
samba-c223beee2a0bd6922eda4551caec0061c86097f2.zip
Merge branch 'tdr' of /home/jelmer/samba4
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/m4/public.m44
1 files changed, 3 insertions, 1 deletions
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