diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-09-27 09:26:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:21 -0500 |
| commit | 8c039e5c911824ca3620ab5dc70cccbb50f58c3a (patch) | |
| tree | cbdee2036895699fb0db0dbccca41ad42fe527eb /source4/build | |
| parent | ccdb6138aba387c45290351ba641256ccaf91e0a (diff) | |
| download | samba-8c039e5c911824ca3620ab5dc70cccbb50f58c3a.tar.gz samba-8c039e5c911824ca3620ab5dc70cccbb50f58c3a.tar.bz2 samba-8c039e5c911824ca3620ab5dc70cccbb50f58c3a.zip | |
r2683: Fix a couple of compile warnings, depend on gtk+-2.4
(This used to be commit 4668384717eda878583477b8f455809056885120)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/public.m4 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/build/smb_build/public.m4 b/source4/build/smb_build/public.m4 index 55d9aa62ba..65dd4ed8ca 100644 --- a/source4/build/smb_build/public.m4 +++ b/source4/build/smb_build/public.m4 @@ -357,13 +357,14 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], SMB_EXT_LIB_ENABLE($1, YES) 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`]) + [`$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"`]) # FIXME: Dirty hack - CFLAGS="$CFLAGS `$PKG_CONFIG --cflags $2`" + $1_CFLAGS="`$PKG_CONFIG --cflags $2`" + CFLAGS="$CFLAGS $$1_CFLAGS" else AC_MSG_RESULT(no) $PKG_CONFIG --errors-to-stdout --print-errors $2 |