[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Jun 4 22:25:05 MDT 2012
The branch, master has been updated
via d6cd48f wintest: Fix test-s3.py to use smbclient3 under the name smbclient
via 1df3982 WHATSNEW: mention FreeBSD getaddrinfo() issue
via b7754f4 s3:build(autoconf): fix "no AC_LANG_SOURCE call detected" warnings
via d99bbb5 WHATSNEW: Mention trouble with DNS replication
via e3d1d6c WHATSNEW: Note FreeBSD improvements
via dc799d4 s4-provision: Test for posix ACLs in the actual sysvol path
via d2b635c s4-provision: Place xattr.tdb in the actual state directory
via 68769c2 WHATSNEW: Update for beta1
via d561ef2 VERSION: prepare for beta1 by setting and parsing the beta version
via 1a2b65c Add '--use-ntvfs' option to 'samba-tool domain join'
via 9db04c4 s3-smbd: Remove support for protocols before LANMAN1
via 3a13581 Remove Manifest. The information here was outdated
via edd7251 libreplace: Add copyrights to ease tracking of this file in future
via 5f58359 libreplace: Remove autoconf build system
from 4accd23 Fix bug #8972 - Directory group write permission bit is set if unix extensions are enabled
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d6cd48fca6bc69e7c8c5070790ec5d48a6dcf3f6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 11:51:18 2012 +1000
wintest: Fix test-s3.py to use smbclient3 under the name smbclient
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Tue Jun 5 06:24:39 CEST 2012 on sn-devel-104
commit 1df39825e4e5e0db3654d1c2eac4697c30457ab2
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 11:41:52 2012 +1000
WHATSNEW: mention FreeBSD getaddrinfo() issue
commit b7754f4bf7f1204e02baf6086c3cbbd7c6ebf1d9
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Dec 16 12:43:34 2011 +1100
s3:build(autoconf): fix "no AC_LANG_SOURCE call detected" warnings
Autoconf 2.68 NEWS says:
** The macros AC_PREPROC_IFELSE, AC_COMPILE_IFELSE, AC_LINK_IFELSE, and
AC_RUN_IFELSE now warn if the first argument failed to use
AC_LANG_SOURCE or AC_LANG_PROGRAM to generate the conftest file
contents. A new macro AC_LANG_DEFINES_PROVIDED exists if you have
a compelling reason why you cannot use AC_LANG_SOURCE but must
avoid the warning.
Signed-off-by: Martin Schwenke <martin at meltin.net>
commit d99bbb52e7763601a638ae24033e4b46691582be
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 11:15:21 2012 +1000
WHATSNEW: Mention trouble with DNS replication
commit e3d1d6c03c04b096b1c4e19eadeb58cf8bdba135
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 10:34:27 2012 +1000
WHATSNEW: Note FreeBSD improvements
commit dc799d4b42551842a9c1dc863568611d82c6168d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 09:58:41 2012 +1000
s4-provision: Test for posix ACLs in the actual sysvol path
This avoids issues in the previous location where lp may not be initialised at this point
and instead simply waits until we have a known sysvol path, and test for ACL support
there.
Andrew Bartlett
commit d2b635cc2f031364be1f25a7f8fb897a78764e5c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 09:56:53 2012 +1000
s4-provision: Place xattr.tdb in the actual state directory
This patch does two things: it fixes up the spelling of "state dir" to
"state directory" so that we actually find the smb.conf parameter, and
we move it to after we process the global settings in case this is
changed in the future.
Andrew Bartlett
commit 68769c26ff1bf7d6b36820c64e71169b35434061
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 09:21:15 2012 +1000
WHATSNEW: Update for beta1
commit d561ef20b5f87bd3a77939de7175daca45679e29
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 09:07:44 2012 +1000
VERSION: prepare for beta1 by setting and parsing the beta version
commit 1a2b65cd31243f36f2a0a63bdad7f6d6f39afc1d
Author: Andriy Syrovenko <andriys at gmail.com>
Date: Tue Jun 5 01:32:42 2012 +0300
Add '--use-ntvfs' option to 'samba-tool domain join'
commit 9db04c481d981ee0ab285e0e34f32c49a7e84641
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 30 12:32:56 2012 +1000
s3-smbd: Remove support for protocols before LANMAN1
This falls out of the removal of security=share, because we now require that
a session setup has been performed before (essentially) all other operations.
Andrew Bartlett
commit 3a1358121ab0d0d950252a0ec770a08bdda90809
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 28 13:08:45 2012 +1000
Remove Manifest. The information here was outdated
commit edd725125792e848a9c1230ae4e57246dcda4352
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 5 08:00:00 2012 +1000
libreplace: Add copyrights to ease tracking of this file in future
As GIT didn't realise this was a copy out of lib/system.c, this should
make it easier to track the copyright holders on this file. Herb's
name wasn't on the original file, but was the only other author I
could find in the git logs.
I've added my copyright here too.
Andrew Bartlett
commit 5f583591db4738f2d0863ccc5253827191f993a0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Jun 2 23:51:39 2012 +1000
libreplace: Remove autoconf build system
This leaves the parts required to build libreplace as a static lib for the autoconf build
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
Manifest | 78 -
VERSION | 12 +-
WHATSNEW.txt | 62 +-
buildtools/wafsamba/samba_version.py | 9 +-
docs-xml/smbdotconf/protocol/serverminprotocol.xml | 2 +-
lib/ccan/libccan.m4 | 72 +-
lib/replace/Makefile.in | 70 -
lib/replace/aclocal.m4 | 1 -
lib/replace/autoconf-2.60.m4 | 236 ---
lib/replace/autogen-autotools.sh | 13 -
lib/replace/build_macros.m4 | 14 -
lib/replace/config.guess | 1561 ------------------
lib/replace/config.sub | 1686 --------------------
lib/replace/configure.ac | 33 -
lib/replace/samba.m4 | 34 -
lib/replace/xattr.c | 2 +
source3/configure.in | 32 +-
source3/param/loadparm.c | 2 +-
source3/script/mkversion.sh | 4 +
source3/smbd/negprot.c | 35 -
source4/scripting/python/samba/join.py | 17 +-
source4/scripting/python/samba/netcmd/domain.py | 13 +-
.../scripting/python/samba/provision/__init__.py | 55 +-
wintest/test-s3.py | 2 +-
24 files changed, 160 insertions(+), 3885 deletions(-)
delete mode 100644 Manifest
delete mode 100644 Read-Manifest-Now
delete mode 100644 lib/replace/Makefile.in
delete mode 100644 lib/replace/aclocal.m4
delete mode 100644 lib/replace/autoconf-2.60.m4
delete mode 100755 lib/replace/autogen-autotools.sh
delete mode 100644 lib/replace/build_macros.m4
delete mode 100755 lib/replace/config.guess
delete mode 100755 lib/replace/config.sub
delete mode 100644 lib/replace/configure.ac
delete mode 100644 lib/replace/samba.m4
Changeset truncated at 500 lines:
diff --git a/Manifest b/Manifest
deleted file mode 100644
index c112d03..0000000
--- a/Manifest
+++ /dev/null
@@ -1,78 +0,0 @@
-Copyright (C) 1997-2003 - Samba-Team
-
-The Samba package you have just unpacked contains the following:
-
-Directory Notes:
-========= ======
-
-docs (Samba Documentation):
----- ----------------------
-
- All the Samba documentation for the 3.0 release have been converted to
- docbook format. Because of this the man pages are now available
- in both traditional man page format (in the docs/manpages directory)
- and in HTML format (in the docs/htmldocs directory).
-
- The Samba HOWTO Collection has undergone some rather large changes
- and covers all parts of configuration now. It is available
- as PDF (docs/Samba3-HOWTO.pdf) or in HTML format (in
- the docs/htmldocs directory). Those with the docbook utilities installed
- can generate PostScript and text versions of the HOWTO as well.
-
- The Samba FAQ is still a work in progress, but can be found in
- HTML format in docs/htmldocs.
-
-
-examples (Example configuration files):
--------- ------------------------------
-
- Please pay close attention to the reference smb.conf file
- smb.conf.default that has now been included as the master guide.
-
- Do read the smb.conf manual page in considering what settings are
- appropriate for your site.
-
-
-packaging (Only for those wishing to build binary distributions):
---------- -------------------------------------------------------
-
- Currently support is included for the following Linux Distributions :
-
- RedHat and SuSE.
-
- In addition, packaging support is available for SGI and Solaris systems.
- We hope that other Unix OS vendors will contribute their binary
- distribution packaging control files - and we hope to make their binary
- packages available on the master ftp site under:
-
- ftp://samba.org/pub/samba/Binary_Packages/"OS_Vendor"
-
-
-source (The official Samba source files - expect more of these!):
------- ----------------------------------------------------------
-
- To build your own binary files you will need a suitable ansi C
- compiler.
-
- Samba uses the GNU autoconf system. In
- order to build a default Samba for your platform cd into
- the source3/ directory and then type :
-
- ./configure
-
- followed by :
-
- make
-
- To install the binaries built by the above type :
-
- make install
-
- then set up your configuration files.
-
- NOTE: OS Vendors who provide Samba binary packages will generally
- integrate all Samba files into their preferred directory locations.
- These may differ from the default location ALWAYS used by the Samba
- sources. Please be careful when upgrading a vendor provided binary
- distribution from files you have built yourself.
-
diff --git a/Read-Manifest-Now b/Read-Manifest-Now
deleted file mode 100644
index e69de29..0000000
diff --git a/VERSION b/VERSION
index 1dc74f2..9cfbd4e 100644
--- a/VERSION
+++ b/VERSION
@@ -57,7 +57,17 @@ SAMBA_VERSION_TP_RELEASE=
# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 #
# -> "4.0.0alpha1" #
########################################################
-SAMBA_VERSION_ALPHA_RELEASE=22
+SAMBA_VERSION_ALPHA_RELEASE=
+
+########################################################
+# For 'alpha' releases the version will be #
+# #
+# <MAJOR>.<MINOR>.<RELEASE>beta<TP_RELEASE> #
+# #
+# e.g. SAMBA_VERSION_BETA_RELEASE=1 #
+# -> "4.0.0beta1" #
+########################################################
+SAMBA_VERSION_BETA_RELEASE=1
########################################################
# For 'pre' releases the version will be #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d737e95..2ec9233 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4 alpha21
+What's new in Samba 4 beta1
=============================
Samba 4.0 will be the next version of the Samba suite and incorporates
@@ -11,7 +11,7 @@ and above.
WARNINGS
========
-Samba4 alpha21 is not a final Samba release, however we are now making
+Samba4 beta1 is not a final Samba release, however we are now making
good progress towards a Samba 4.0 release, of which this is a preview.
Be aware the this release contains the best of all of Samba's
technology parts, both a file server (that you can reasonably expect
@@ -21,22 +21,23 @@ controller work previously known as 'samba4'.
Samba4 is subjected to an awesome battery of tests on an automated
basis, we have found Samba 4.0 to be very stable in it's behavior.
However, we still recommend against upgrading production servers from
-Samba 3.x release to Samba 4.0 alpha at this stage.
+Samba 3.x release to Samba 4.0 beta at this stage.
In particular note that the new default configuration 's3fs' may have
different stability characteristics compared with our previous default
file server. We are making this release so that we can find and fix
-any of these issues that arise in the real world. New AD DC installations
-can provision with --use-ntvfs to obtain the previous default file
-server. Existing installations will be unaffected at this stage.
+any of these issues that arise in the real world. New AD DC
+installations can provision or join with --use-ntvfs to obtain the
+previous default file server. Existing installations will be
+unaffected at this stage.
If you are upgrading, or looking to develop, test or deploy Samba 4.0
-alpha releases, you should backup all configuration and data.
+beta releases, you should backup all configuration and data.
NEW FEATURES
============
-Samba 4.0 alpha supports the server-side of the Active Directory logon
+Samba 4.0 beta supports the server-side of the Active Directory logon
environment used by Windows 2000 and later, so we can do full domain
join and domain logon operations with these clients.
@@ -46,7 +47,7 @@ Samba3-like logon services provided over CIFS. We correctly generate
the infamous Kerberos PAC, and include it with the Kerberos tickets we
issue.
-Samba 4.0 alpha ships with two distinct file servers. We now use the
+Samba 4.0 beta ships with two distinct file servers. We now use the
file server from the Samba 3.x series 'smbd' for all file serving by
default. For pure file server work, the binaries users would expect
from that series (nmbd, winbindd, smbpasswd) continue to be available.
@@ -69,47 +70,50 @@ internal workings of the DC code is now implemented in python.
-CHANGES SINCE alpha20
+CHANGES SINCE alpha21
=====================
-For a list of changes since alpha20, please see the git log.
+For a list of changes since alpha21, please see the git log.
$ git clone git://git.samba.org/samba.git
$ cd samba.git
-$ git log samba-4.0.0alpha20..samba-4.0.0alpha21
+$ git log samba-4.0.0alpha21..samba-4.0.0beta1
Some major user-visible changes include:
-For installations that do not need an AD Domain controller, we can now
-build using MIT Kerberos from the local system. This is important for
-some distributors. This is enabled with the new --with-system-mitkrb5
-configure option. A synonym is the new --without-ad-dc option.
+The internal DNS server has had some stability improvements, and
+now handles forwarded DNS replies in an async manner.
-The 's3fs' effort has moved to a new stage, with this now being the
-default mode of operation for new provisions.
+The build of libtdb.so and libtalloc.so has been removed from the
+autoconf build. Use the build in lib/talloc and lib/tdb to build
+this software for use across the system.
-The BIND 9 DLZ plugin has had some stability improvements under BIND reloads.
+The smbclient and nmblookup binaries have been renamed in the top
+level build, so smbclient/nmblookup are now the implementations from
+the Samba 3.x heritage.
-The 'samba-tool domain samba3upgrade' tool will now generally import
-all group members, and correctly imports domain password policies.
-
-Some major but less visible changes include:
-
-Continued early implementation work on the SMB 2.2 protocol client and server as
-the team improves and develops support these new protocols.
+Improved handling of the cleanup of smbd child processes (removing a
+number of scary warnings from our log output).
+Much improved support for FreeBSD, including extended attribute
+support on the filesystem for the AD DC.
KNOWN ISSUES
============
-- We are making this alpha release to gain real-world use of the 's3fs'
+- We are making this beta release to gain real-world use of the 's3fs'
file server combination we will use for the Samba 4.0 release.
Users should expect some rough edges: in particular, there are
warnings about invalid parameters from the two respective parameter
parsing engines.
-- There have been improvements to FreeBSD support, but more work is
- still required to finish this effort
+- Replication of DNS data from one AD server to another may not work.
+ The DNS data used by the internal DNS server and bind9_dlz is stored
+ in an application partition in our directory. The replicaton of
+ this partition is not yet reliable.
+
+- Replication may fail on FreeBSD due to getaddrinfo() rejecting names
+ containing _. A workaround will be in the next beta.
- upgradeprovision should not be run when upgrading to this release
from a recent release. No important database format changes have
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 96d5d0d..9dae23a 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -107,6 +107,7 @@ also accepted as dictionary entries here
self.REVISION=None
self.TP_RELEASE=None
self.ALPHA_RELEASE=None
+ self.BETA_RELEASE=None
self.PRE_RELEASE=None
self.RC_RELEASE=None
self.IS_SNAPSHOT=True
@@ -137,7 +138,7 @@ also accepted as dictionary entries here
SAMBA_VERSION_STRING = ("%u.%u.%u" % (self.MAJOR, self.MINOR, self.RELEASE))
##
-## maybe add "3.0.22a" or "4.0.0tp11" or "4.0.0alpha1" or "3.0.22pre1" or "3.0.22rc1"
+## maybe add "3.0.22a" or "4.0.0tp11" or "4.0.0alpha1" or "4.0.0beta1" or "3.0.22pre1" or "3.0.22rc1"
## We do not do pre or rc version on patch/letter releases
##
if self.REVISION is not None:
@@ -148,6 +149,9 @@ also accepted as dictionary entries here
if self.ALPHA_RELEASE is not None:
self.ALPHA_RELEASE = int(self.ALPHA_RELEASE)
SAMBA_VERSION_STRING += ("alpha%u" % self.ALPHA_RELEASE)
+ if self.BETA_RELEASE is not None:
+ self.BETA_RELEASE = int(self.BETA_RELEASE)
+ SAMBA_VERSION_STRING += ("beta%u" % self.BETA_RELEASE)
if self.PRE_RELEASE is not None:
self.PRE_RELEASE = int(self.PRE_RELEASE)
SAMBA_VERSION_STRING += ("pre%u" % self.PRE_RELEASE)
@@ -201,6 +205,9 @@ also accepted as dictionary entries here
if self.ALPHA_RELEASE is not None:
string+="#define SAMBA_VERSION_ALPHA_RELEASE %u\n" % self.ALPHA_RELEASE
+ if self.BETA_RELEASE is not None:
+ string+="#define SAMBA_VERSION_BETA_RELEASE %u\n" % self.BETA_RELEASE
+
if self.PRE_RELEASE is not None:
string+="#define SAMBA_VERSION_PRE_RELEASE %u\n" % self.PRE_RELEASE
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index 1fbb7dc..c72ae59 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -20,6 +20,6 @@
<related>server min protocol</related>
<synonym>min protocol</synonym>
-<value type="default">CORE</value>
+<value type="default">LANMAN1</value>
<value type="example">NT1</value>
</samba:parameter>
diff --git a/lib/ccan/libccan.m4 b/lib/ccan/libccan.m4
index 93dc99e..3b71d7b 100644
--- a/lib/ccan/libccan.m4
+++ b/lib/ccan/libccan.m4
@@ -24,11 +24,11 @@ AC_SUBST(CCAN_CFLAGS)
AC_CACHE_CHECK([whether we can compile with __attribute__((cold))],
samba_cv_attribute_cold,
[
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[
static void __attribute__((cold))
cleanup(void) { }
- ],
+ ])],
samba_cv_attribute_cold=yes)
])
@@ -40,11 +40,11 @@ fi
AC_CACHE_CHECK([whether we can compile with __attribute__((const))],
samba_cv_attribute_const,
[
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[
static void __attribute__((const))
cleanup(void) { }
- ],
+ ])],
samba_cv_attribute_const=yes)
])
@@ -56,11 +56,11 @@ fi
AC_CACHE_CHECK([whether we can compile with __attribute__((noreturn))],
samba_cv_attribute_noreturn,
[
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[
static void __attribute__((noreturn))
cleanup(void) { exit(1); }
- ],
+ ])],
samba_cv_attribute_noreturn=yes)
])
@@ -72,11 +72,11 @@ fi
AC_CACHE_CHECK([whether we can compile with __attribute__((printf))],
samba_cv_attribute_printf,
[
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[
static void __attribute__((format(__printf__, 1, 2)))
cleanup(const char *fmt, ...) { }
- ],
+ ])],
samba_cv_attribute_printf=yes)
])
@@ -88,11 +88,11 @@ fi
AC_CACHE_CHECK([whether we can compile with __attribute__((unused))],
samba_cv_attribute_unused,
[
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[
static void __attribute__((unused))
cleanup(void) { }
- ],
+ ])],
samba_cv_attribute_unused=yes)
])
@@ -104,11 +104,11 @@ fi
AC_CACHE_CHECK([whether we can compile with __attribute__((used))],
samba_cv_attribute_used,
[
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[
static void __attribute__((used))
cleanup(void) { }
- ],
+ ])],
samba_cv_attribute_used=yes)
])
@@ -135,10 +135,10 @@ fi
AC_CACHE_CHECK([whether we have __builtin_clz],
samba_cv_builtin_clz,
[
- AC_LINK_IFELSE(
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
[int main(void) {
return __builtin_clz(1) == (sizeof(int)*8 - 1) ? 0 : 1;
- }],
+ }])],
samba_cv_builtin_clz=yes)
])
@@ -150,10 +150,10 @@ fi
AC_CACHE_CHECK([whether we have __builtin_clzl],
samba_cv_builtin_clzl,
[
- AC_LINK_IFELSE(
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
[int main(void) {
return __builtin_clzl(1) == (sizeof(int)*8 - 1) ? 0 : 1;
- }],
+ }])],
samba_cv_builtin_clzl=yes)
])
@@ -164,10 +164,10 @@ fi
AC_CACHE_CHECK([whether we have __builtin_clzll],
samba_cv_builtin_clzll,
[
- AC_LINK_IFELSE(
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
[int main(void) {
return __builtin_clzll(1) == (sizeof(int)*8 - 1) ? 0 : 1;
- }],
+ }])],
samba_cv_builtin_clzll=yes)
])
@@ -179,10 +179,10 @@ fi
AC_CACHE_CHECK([whether we have __builtin_constant_p],
samba_cv_builtin_constant_p,
[
- AC_LINK_IFELSE(
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
[int main(void) {
return __builtin_constant_p(1) ? 0 : 1;
- }],
+ }])],
samba_cv_builtin_constant_p=yes)
])
@@ -194,10 +194,10 @@ fi
AC_CACHE_CHECK([whether we have __builtin_expect],
samba_cv_builtin_expect,
[
- AC_LINK_IFELSE(
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
[int main(void) {
return __builtin_expect(main != 0, 1) ? 0 : 1;
- }],
+ }])],
samba_cv_builtin_expect=yes)
])
@@ -209,10 +209,10 @@ fi
AC_CACHE_CHECK([whether we have __builtin_popcountl],
samba_cv_builtin_popcountl,
[
- AC_LINK_IFELSE(
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
[int main(void) {
return __builtin_popcountl(255L) == 8 ? 0 : 1;
- }],
+ }])],
samba_cv_builtin_popcountl=yes)
])
@@ -224,10 +224,10 @@ fi
AC_CACHE_CHECK([whether we have __builtin_types_compatible_p],
samba_cv_builtin_types_compatible_p,
[
- AC_LINK_IFELSE(
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
[int main(void) {
return __builtin_types_compatible_p(char *, int) ? 1 : 0;
- }],
+ }])],
samba_cv_builtin_types_compatible_p=yes)
])
@@ -239,10 +239,10 @@ fi
AC_CACHE_CHECK([whether we have __builtin_choose_expr],
samba_cv_builtin_choose_expr,
[
- AC_LINK_IFELSE(
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
[int main(void) {
return __builtin_choose_expr(1, 0, "garbage");
- }],
+ }])],
samba_cv_builtin_choose_expr=yes)
])
@@ -255,11 +255,11 @@ fi
AC_CACHE_CHECK([whether we have compound literals],
samba_cv_compound_literals,
[
- AC_COMPILE_IFELSE(
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[int main(void) {
int *foo = (int@<:@@:>@) { 1, 2, 3, 4 };
return foo@<:@0@:>@ == 1 ? 0 : 1;
- }],
+ }])],
samba_cv_compound_literals=yes)
])
@@ -271,10 +271,10 @@ fi
AC_CACHE_CHECK([whether we have isblank],
--
Samba Shared Repository
More information about the samba-cvs
mailing list