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 2c8fa17ad98c9cf0b1d1e7fb090bff95cb256cf0..680ee5daf025b4b1dd3c2c6be51d0b94305d0b9c 100644 (file)
--- 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 704811bf06b8962642dad272caec9804746cbebe..5fadcfb08a948a7a50aed8de9364f165bc282272 100644 (file)
--- 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
 "