s3: Attempt to fix the build on NetBSD

Unlike Linux and OSX, NetBSD seems to have *netgrent prototypes in netgroup.h.

diff --git a/source3/configure.in b/source3/configure.in
index 04ddc037921ce1030c062471e3d4d00d93930fd3..424c320faef11b7ca40b398ade9396ba11479e0d 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6423,19 +6423,22 @@ AC_SUBST(FLAGS1)
 CFLAGS_SAVE=$CFLAGS
 CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 AC_CACHE_CHECK([for setnetgrent prototype],samba_cv_setnetgrent_prototype, [
-    AC_TRY_COMPILE([#include<netdb.h>],[setnetgrent("foo")],
+    AC_TRY_COMPILE([#include<netdb.h>
+                    #include<netgroup.h>],[setnetgrent("foo")],
                     samba_cv_setnetgrent_prototype=yes, samba_cv_setnetgrent_prototype=no)])
 if test x"$samba_cv_setnetgrent_prototype" = x"yes"; then
     AC_DEFINE(HAVE_SETNETGRENT_PROTOTYPE, 1, [If setnetgrent prototype is defined])
 fi
 AC_CACHE_CHECK([for getnetgrent prototype],samba_cv_getnetgrent_prototype, [
-    AC_TRY_COMPILE([#include<netdb.h>],[char *dom, *user,*host; getnetgrent(&dom,&user,&host)],
+    AC_TRY_COMPILE([#include<netdb.h>
+                    #include<netgroup.h>],[char *dom, *user,*host; getnetgrent(&dom,&user,&host)],
                     samba_cv_getnetgrent_prototype=yes, samba_cv_getnetgrent_prototype=no)])
 if test x"$samba_cv_getnetgrent_prototype" = x"yes"; then
     AC_DEFINE(HAVE_GETNETGRENT_PROTOTYPE, 1, [If getnetgrent prototype is defined])
 fi
 AC_CACHE_CHECK([for endnetgrent prototype],samba_cv_endnetgrent_prototype, [
-    AC_TRY_COMPILE([#include<netdb.h>],[endnetgrent()],
+    AC_TRY_COMPILE([#include<netdb.h>
+                    #include<netgroup.h>],[endnetgrent()],
                     samba_cv_endnetgrent_prototype=yes, samba_cv_endnetgrent_prototype=no)])
 if test x"$samba_cv_endnetgrent_prototype" = x"yes"; then
     AC_DEFINE(HAVE_ENDNETGRENT_PROTOTYPE, 1, [If endnetgrent prototype is defined])

diff --git a/source3/wscript b/source3/wscript
index aec71afc5c6ca9c5df056b3292222f37fc411015..0b31563343d62af3133f45f93638af1bfd74f3e3 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -364,15 +364,15 @@ utimensat vsyslog _write __write __xstat
     conf.CHECK_FUNCS('setnetgrent getnetgrent endnetgrent')
     conf.CHECK_CODE('setnetgrent("foo")', 'HAVE_SETNETGRENT_PROTOTYPE',
                     msg="Checking for setnetgrent prototype",
-                    headers='netdb.h',
+                    headers='netdb.h netgroup.h',
                     cflags="-Werror-implicit-function-declaration")
     conf.CHECK_CODE('getnetgrent', 'HAVE_GETNETGRENT_PROTOTYPE',
                     msg="Checking for getnetgrent prototype",
-                    headers='netdb.h',
+                    headers='netdb.h netgroup.h',
                     cflags="-Werror-implicit-function-declaration")
     conf.CHECK_CODE('endnetgrent', 'HAVE_ENDNETGRENT_PROTOTYPE',
                     msg="Checking for endnetgrent prototype",
-                    headers='netdb.h',
+                    headers='netdb.h netgroup.h',
                     cflags="-Werror-implicit-function-declaration")
 
     #FIXME: Should just be set when krb5 and ldap requirements are fulfilled