From ca5eaf0cdcf8257ac52786aa7439c8f081a2fe0d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 19 Jan 2018 09:32:49 +0100 Subject: [PATCH] s3:waf: Move HAVE_NETGROUP to wscript BUG: https://bugzilla.samba.org/show_bug.cgi?id=13238 Pair-Programmed-With: Guenther Deschner Signed-off-by: Andreas Schneider Signed-off-by: Guenther Deschner Reviewed-by: Alexander Bokovoy --- source3/include/includes.h | 4 ---- source3/wscript | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source3/include/includes.h b/source3/include/includes.h index e82bfad4147..e2fb8e62e41 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -91,10 +91,6 @@ #include #endif -#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined(HAVE_SETNETGRENT) && defined(HAVE_ENDNETGRENT) && defined(HAVE_GETNETGRENT) -#define HAVE_NETGROUP 1 -#endif - #if defined (HAVE_NETGROUP) #if defined(HAVE_RPCSVC_YP_PROT_H) /* diff --git a/source3/wscript b/source3/wscript index e81a212b448..3722b5a56ec 100644 --- a/source3/wscript +++ b/source3/wscript @@ -611,6 +611,11 @@ msg.msg_accrightslen = sizeof(fd); headers='netdb.h netgroup.h', cflags=netgrent_cflags) + if (conf.CONFIG_SET('HAVE_YP_GET_DEFAULT_DOMAIN') and + conf.CONFIG_SET('HAVE_SETNETGRENT') and + conf.CONFIG_SET('HAVE_ENDNETGRENT') and + conf.CONFIG_SET('HAVE_GETNETGRENT')): + conf.DEFINE('HAVE_NETGROUP', '1') # Look for CUPS if Options.options.with_cups: -- 2.47.3