From: Matthieu Patou <mat@matws.net>
Date: Sun, 28 Feb 2010 20:02:00 +0000 (+0300)
Subject: s4-build: fix SMB_LIBRARY and change its name so it didn't collide with s3 one
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=e0726d4d661cfc508e8e8fd210a2cfba7ed53682;p=kamenim%2Fsamba.git

s4-build: fix SMB_LIBRARY and change its name so it didn't collide with s3 one

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/nsswitch/config.m4 b/nsswitch/config.m4
index 2c8fa17ad9..680ee5daf0 100644
--- a/nsswitch/config.m4
+++ b/nsswitch/config.m4
@@ -2,7 +2,7 @@ AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h )
 
 case "$host_os" in
 	*linux*)
-		SMB_LIBRARY(nss_winbind,
+		SMB_BUILD_LIBRARY(nss_winbind,
 			    [../nsswitch/winbind_nss_linux.o],
 			    [LIBWINBIND-CLIENT])
 	;;
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 704811bf06..5fadcfb08a 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -43,12 +43,12 @@ ENABLE = YES
 "
 ])
 
-dnl SMB_LIBRARY(name,obj_files,required_subsystems,cflags,ldflags)
-AC_DEFUN([SMB_LIBRARY],
+dnl SMB_BUILD_LIBRARY(name,obj_files,required_subsystems,cflags,ldflags)
+AC_DEFUN([SMB_BUILD_LIBRARY],
 [
 MAKE_SETTINGS="$MAKE_SETTINGS
-$1_CFLAGS = $6
-$1_LDFLAGS = $7
+$1_CFLAGS = $4
+$1_LDFLAGS = $5
 n1_ENABLE = YES
 $1_OBJ_FILES = $2
 "