Author: metze Date: 2004-10-08 09:37:55 +0000 (Fri, 08 Oct 2004) New Revision: 2858
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2858&nolog=1 Log: fix a few SMB_EXT_LIB_FROM_PKGCONFIG() bugs metze Modified: branches/SAMBA_4_0/source/build/smb_build/public.m4 branches/SAMBA_4_0/source/gtk/config.m4 Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/public.m4 =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/public.m4 2004-10-08 08:13:00 UTC (rev 2857) +++ branches/SAMBA_4_0/source/build/smb_build/public.m4 2004-10-08 09:37:55 UTC (rev 2858) @@ -352,22 +352,22 @@ 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." Modified: branches/SAMBA_4_0/source/gtk/config.m4 =================================================================== --- branches/SAMBA_4_0/source/gtk/config.m4 2004-10-08 08:13:00 UTC (rev 2857) +++ branches/SAMBA_4_0/source/gtk/config.m4 2004-10-08 09:37:55 UTC (rev 2858) @@ -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)
