summaryrefslogtreecommitdiff
path: root/source3/configure
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-01-11 23:41:33 +0000
committerJeremy Allison <jra@samba.org>2001-01-11 23:41:33 +0000
commitcffc311b8a897641166728f27464ba7d37a2092c (patch)
tree35a337d4fea2f16407bf76502dfb972ccc93efba /source3/configure
parentea1e6f9e7bc845ddf93a1603d7e43050be0e7917 (diff)
downloadsamba-cffc311b8a897641166728f27464ba7d37a2092c.tar.gz
samba-cffc311b8a897641166728f27464ba7d37a2092c.tar.bz2
samba-cffc311b8a897641166728f27464ba7d37a2092c.zip
Fixed typo with acl_set_fd() not needing an ACL_TYPE_T parameter.
Ensure HAVE_NO_ACLS is set in configure if ACL support not selected. Jeremy (This used to be commit 523c91935621ec2d200a79385046694806f7c837)
Diffstat (limited to 'source3/configure')
-rwxr-xr-xsource3/configure16
1 files changed, 10 insertions, 6 deletions
diff --git a/source3/configure b/source3/configure
index 8248a92944..105f82f26d 100755
--- a/source3/configure
+++ b/source3/configure
@@ -923,7 +923,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1820,7 +1820,7 @@ for ac_kw in inline __inline__ __inline; do
#include "confdefs.h"
int main() {
-} int $ac_kw foo() {
+} $ac_kw foo() {
; return 0; }
EOF
if { (eval echo configure:1827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -2961,7 +2961,7 @@ else
int main() {
/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
/* SunOS 4.1.1 cc rejects this. */
char const *const *ccp;
char **p;
@@ -3036,7 +3036,7 @@ for ac_kw in inline __inline__ __inline; do
#include "confdefs.h"
int main() {
-} int $ac_kw foo() {
+} $ac_kw foo() {
; return 0; }
EOF
if { (eval echo configure:3043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -11565,6 +11565,10 @@ fi
;;
*)
echo "$ac_t""no" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_NO_ACLS 1
+EOF
+
;;
esac
else
@@ -11578,11 +11582,11 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 11582 "configure"
+#line 11586 "configure"
#include "confdefs.h"
#include "${srcdir-.}/tests/summary.c"
EOF
-if { (eval echo configure:11586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "configure OK";
else