From f210b988049615f3f0caf6344b575e2b8f064edd Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 8 Oct 2004 09:37:55 +0000
Subject: r2858: fix a few SMB_EXT_LIB_FROM_PKGCONFIG() bugs

metze
(This used to be commit 285d1ea4b09d4fc325544ad1b98244cc1046759c)
---
 source4/build/smb_build/public.m4 | 14 +++++++-------
 source4/gtk/config.m4             |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source4')

diff --git a/source4/build/smb_build/public.m4 b/source4/build/smb_build/public.m4
index 65dd4ed8ca..b03eafe7b4 100644
--- a/source4/build/smb_build/public.m4
+++ b/source4/build/smb_build/public.m4
@@ -352,22 +352,22 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
 		if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then
         		AC_MSG_CHECKING(for $2)
 
-          		if $PKG_CONFIG --exists "$2" ; then
+          		if $PKG_CONFIG --exists '$2' ; then
             			AC_MSG_RESULT(yes)
 
 				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
-				$1_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
+            			$PKG_CONFIG --errors-to-stdout --print-errors '$2'
         		fi
      		else
         		echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
diff --git a/source4/gtk/config.m4 b/source4/gtk/config.m4
index 7757eae8be..0518f3af55 100644
--- a/source4/gtk/config.m4
+++ b/source4/gtk/config.m4
@@ -1,6 +1,6 @@
 dnl # LIB GTK SMB subsystem
 
-SMB_EXT_LIB_FROM_PKGCONFIG(gtk, [glib-2.0 gtk+-2.0>=2.4])
+SMB_EXT_LIB_FROM_PKGCONFIG(gtk, [glib-2.0 gtk+-2.0 >= 2.4])
 SMB_SUBSYSTEM_ENABLE(GTKSMB, NO)
 SMB_BINARY_ENABLE(gregedit, NO)
 SMB_BINARY_ENABLE(gwcrontab, NO)
-- 
cgit