sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r2858: fix a few SMB_EXT_LIB_FROM_PKGCONFIG() bugs

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2004-10-08 09:37:55 +00:00 committed by Gerald (Jerry) Carter
parent 814881f0e5
commit 285d1ea4b0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/build/smb_build/public.m4
View File

@ -352,22 +352,22 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then
AC_MSG_CHECKING(for $2) AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then if $PKG_CONFIG --exists '$2' ; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
SMB_EXT_LIB_ENABLE($1, YES) SMB_EXT_LIB_ENABLE($1, YES)
SMB_EXT_LIB($1, SMB_EXT_LIB($1,
[`$PKG_CONFIG --libs-only-l "$2"`], [`$PKG_CONFIG --libs-only-l '$2'`],
[`$PKG_CONFIG --cflags-only-other "$2"`], [`$PKG_CONFIG --cflags-only-other '$2'`],
[`$PKG_CONFIG --cflags-only-I "$2"`], [`$PKG_CONFIG --cflags-only-I '$2'`],
[`$PKG_CONFIG --libs-only-other "$2"` `$PKG_CONFIG --libs-only-L "$2"`]) [`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`])
# FIXME: Dirty hack # FIXME: Dirty hack
$1_CFLAGS="`$PKG_CONFIG --cflags $2`" $1_CFLAGS="`$PKG_CONFIG --cflags '$2'`"
CFLAGS="$CFLAGS $$1_CFLAGS" CFLAGS="$CFLAGS $$1_CFLAGS"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
$PKG_CONFIG --errors-to-stdout --print-errors $2 $PKG_CONFIG --errors-to-stdout --print-errors '$2'
fi fi
else else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."

2
source/gtk/config.m4
View File

@ -1,6 +1,6 @@
dnl # LIB GTK SMB subsystem 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_SUBSYSTEM_ENABLE(GTKSMB, NO)
SMB_BINARY_ENABLE(gregedit, NO) SMB_BINARY_ENABLE(gregedit, NO)
SMB_BINARY_ENABLE(gwcrontab, NO) SMB_BINARY_ENABLE(gwcrontab, NO)