[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Mon Apr 18 08:25:02 MDT 2011
The branch, master has been updated
via c2a62e8 s3 waf: Mimic the autoconf check for netgrent
via d09f029 s3 autobuild: Fix CFLAG check for netgrent tests
from 83a0b94 s3: Fix the build of vfs_gpfs.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c2a62e854632dcae69a5ae911b6ab11e272d0a81
Author: Kai Blin <kai at samba.org>
Date: Mon Apr 18 14:55:51 2011 +0200
s3 waf: Mimic the autoconf check for netgrent
The autoconf check for netgrent headers makes sure that the compiler flag used
(-Werror-implicit-function-declaration) is recognized by the compiler before
using it for the test. Mimic this behaviour in the waf checks.
Thanks to gd for noticing this.
Signed-off-by: Günther Deschner <gd at samba.org>
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Mon Apr 18 16:24:15 CEST 2011 on sn-devel-104
commit d09f02909f6adae1d68264bd3790c77fcee5e80d
Author: Kai Blin <kai at samba.org>
Date: Mon Apr 18 14:48:47 2011 +0200
s3 autobuild: Fix CFLAG check for netgrent tests
In 45ac8ffd I accidently added the wrong flag check. Fix this.
Thanks to gd for noticing.
Signed-off-by: Günther Deschner <gd at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 2 +-
source3/wscript | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 086e044..c951828 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6687,7 +6687,7 @@ AC_SUBST(FLAGS1)
###################################################
# Check for different/missing (set|get|end)netgrent prototypes
CFLAGS_SAVE=$CFLAGS
-if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
+if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
fi
AC_CACHE_CHECK([for setnetgrent prototype],samba_cv_setnetgrent_prototype, [
diff --git a/source3/wscript b/source3/wscript
index ffcecca..2d454c5 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -522,18 +522,22 @@ msg.msg_acctrightslen = sizeof(fd);
define='HAVE_DIRENT_D_OFF')
conf.CHECK_FUNCS('setnetgrent getnetgrent endnetgrent')
+ if conf.CHECK_CFLAGS('-Werror-implicit-function-declaration'):
+ netgrent_cflags = '-Werror-implicit-function-declaration'
+ else:
+ netgrent_cflags = ''
conf.CHECK_CODE('setnetgrent("foo")', 'HAVE_SETNETGRENT_PROTOTYPE',
msg="Checking for setnetgrent prototype",
headers='netdb.h netgroup.h',
- cflags="-Werror-implicit-function-declaration")
+ cflags=netgrent_cflags)
conf.CHECK_CODE('getnetgrent', 'HAVE_GETNETGRENT_PROTOTYPE',
msg="Checking for getnetgrent prototype",
headers='netdb.h netgroup.h',
- cflags="-Werror-implicit-function-declaration")
+ cflags=netgrent_cflags)
conf.CHECK_CODE('endnetgrent', 'HAVE_ENDNETGRENT_PROTOTYPE',
msg="Checking for endnetgrent prototype",
headers='netdb.h netgroup.h',
- cflags="-Werror-implicit-function-declaration")
+ cflags=netgrent_cflags)
# Look for CUPS
--
Samba Shared Repository
More information about the samba-cvs
mailing list