diff options
Diffstat (limited to 'source3/configure')
| -rwxr-xr-x | source3/configure | 69 |
1 files changed, 43 insertions, 26 deletions
diff --git a/source3/configure b/source3/configure index 35ed71f6bb..3010936deb 100755 --- a/source3/configure +++ b/source3/configure @@ -89,8 +89,8 @@ ac_help="$ac_help ac_help="$ac_help --with-spinlocks use spin locks instead of fcntl locks " ac_help="$ac_help - --with-posix-acls Include POSIX ACL support - --without-posix-acls Don't include POSIX ACL support (default)" + --with-acl-support Include ACL support + --without-acl-support Don't include ACL support (default)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -11470,18 +11470,34 @@ EOF fi ################################################# -# check for POSIX ACL support +# check for ACL support -echo $ac_n "checking whether to support POSIX ACLs""... $ac_c" 1>&6 -echo "configure:11477: checking whether to support POSIX ACLs" >&5 -# Check whether --with-posix-acls or --without-posix-acls was given. -if test "${with_posix_acls+set}" = set; then - withval="$with_posix_acls" +echo $ac_n "checking whether to support ACLs""... $ac_c" 1>&6 +echo "configure:11477: checking whether to support ACLs" >&5 +# Check whether --with-acl-support or --without-acl-support was given. +if test "${with_acl_support+set}" = set; then + withval="$with_acl_support" case "$withval" in yes) - echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6 -echo "configure:11485: checking for acl_get_file in -lacl" >&5 + case "$host_os" in + *unixware*) + echo "$ac_t""Using SVR4 ACLs" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_UNIXWARE_ACLS 1 +EOF + + ;; + *solaris*) + echo "$ac_t""Using solaris ACLs" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_SOLARIS_ACLS 1 +EOF + + ;; + *) + echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6 +echo "configure:11501: checking for acl_get_file in -lacl" >&5 ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11489,7 +11505,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lacl $LIBS" cat > conftest.$ac_ext <<EOF -#line 11493 "configure" +#line 11509 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11500,7 +11516,7 @@ int main() { acl_get_file() ; return 0; } EOF -if { (eval echo configure:11504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11527,14 +11543,14 @@ else echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for POSIX ACL support""... $ac_c" 1>&6 -echo "configure:11532: checking for POSIX ACL support" >&5 + echo $ac_n "checking for ACL support""... $ac_c" 1>&6 +echo "configure:11548: checking for ACL support" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_POSIX_ACLS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -cat > conftest.$ac_ext <<EOF -#line 11538 "configure" + cat > conftest.$ac_ext <<EOF +#line 11554 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/acl.h> @@ -11542,7 +11558,7 @@ int main() { acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p); ; return 0; } EOF -if { (eval echo configure:11546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_POSIX_ACLS=yes else @@ -11555,14 +11571,16 @@ rm -f conftest* fi echo "$ac_t""$samba_cv_HAVE_POSIX_ACLS" 1>&6 -if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then + echo "$ac_t""Using posix ACLs" 1>&6 + cat >> confdefs.h <<\EOF #define HAVE_POSIX_ACLS 1 EOF -fi - ;; + fi + ;; + esac + ;; *) echo "$ac_t""no" 1>&6 cat >> confdefs.h <<\EOF @@ -11572,25 +11590,24 @@ EOF ;; esac else - echo "$ac_t""no" 1>&6 cat >> confdefs.h <<\EOF #define HAVE_NO_ACLS 1 EOF + echo "$ac_t""no" 1>&6 fi - echo "checking configure summary" if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 11590 "configure" +#line 11607 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/summary.c" EOF -if { (eval echo configure:11594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "configure OK"; else |