X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source4%2Fbuild%2Fm4%2Fpublic.m4;h=ba8251e65d21e56b18dc396c027f6ceb392f6582;hb=cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31;hp=0058afe2b51ec48c140e4c63622eba60b1ec166c;hpb=d1432d617e6ed04c33ca214d7f3b0099bdf53065;p=samba.git diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 0058afe2b51..ba8251e65d2 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -4,8 +4,6 @@ dnl Copyright (C) 2004 Stefan Metzmacher dnl Copyright (C) 2004-2005 Jelmer Vernooij dnl Published under the GPL dnl -dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems) -dnl dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) dnl dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags) @@ -22,9 +20,9 @@ dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems,cflags) AC_DEFUN([SMB_SUBSYSTEM], [ MAKE_SETTINGS="$MAKE_SETTINGS -$1_OBJ_FILES = $2 $1_CFLAGS = $4 $1_ENABLE = YES +$1_OBJ_FILES = $2 " SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS @@ -43,10 +41,10 @@ dnl SMB_LIBRARY(name,obj_files,required_subsystems,cflags,ldflags) AC_DEFUN([SMB_LIBRARY], [ MAKE_SETTINGS="$MAKE_SETTINGS +$1_CFLAGS = $6 +$1_LDFLAGS = $7 +n1_ENABLE = YES $1_OBJ_FILES = $2 -$1_CFLAGS = $4 -$1_LDFLAGS = $5 -$1_ENABLE = YES " SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES