From 8c039e5c911824ca3620ab5dc70cccbb50f58c3a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 27 Sep 2004 09:26:37 +0000
Subject: r2683: Fix a couple of compile warnings, depend on gtk+-2.4 (This
 used to be commit 4668384717eda878583477b8f455809056885120)

---
 source4/build/smb_build/public.m4 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source4/build/smb_build')

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
-- 
cgit