mirror of
https://github.com/samba-team/samba.git
synced 2025-02-19 21:57:57 +03:00
Turn on sendfile detection by default in HEAD and 3.0.
Jeremy.
This commit is contained in:
Jeremy Allison
-
parent
bb58a08af4
commit
6a9d0c9bdd
85
source/configure
vendored
85
source/configure
vendored
@ -87,7 +87,7 @@ ac_help="$ac_help
|
||||
ac_help="$ac_help
|
||||
--with-acl-support Include ACL support (default=no)"
|
||||
ac_help="$ac_help
|
||||
--with-sendfile-support Check for sendfile support (default=no)"
|
||||
--with-sendfile-support Check for sendfile support (default=yes)"
|
||||
ac_help="$ac_help
|
||||
--with-winbind Build winbind (default, if supported by OS)"
|
||||
ac_help="$ac_help
|
||||
@ -13909,8 +13909,9 @@ fi
|
||||
#################################################
|
||||
# check for sendfile support
|
||||
|
||||
echo $ac_n "checking whether to check for support sendfile""... $ac_c" 1>&6
|
||||
echo "configure:13914: checking whether to check for support sendfile" >&5
|
||||
with_sendfile_support=yes
|
||||
echo $ac_n "checking whether to check to support sendfile""... $ac_c" 1>&6
|
||||
echo "configure:13915: checking whether to check to support sendfile" >&5
|
||||
# Check whether --with-sendfile-support or --without-sendfile-support was given.
|
||||
if test "${with_sendfile_support+set}" = set; then
|
||||
withval="$with_sendfile_support"
|
||||
@ -13922,13 +13923,13 @@ if test "${with_sendfile_support+set}" = set; then
|
||||
case "$host_os" in
|
||||
*linux*)
|
||||
echo $ac_n "checking for linux sendfile64 support""... $ac_c" 1>&6
|
||||
echo "configure:13926: checking for linux sendfile64 support" >&5
|
||||
echo "configure:13927: checking for linux sendfile64 support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_SENDFILE64'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13932 "configure"
|
||||
#line 13933 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/sendfile.h>
|
||||
int main() {
|
||||
@ -13940,7 +13941,7 @@ ssize_t nwritten = sendfile64(tofd, fromfd, &offset, total);
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_SENDFILE64=yes
|
||||
else
|
||||
@ -13955,13 +13956,13 @@ fi
|
||||
echo "$ac_t""$samba_cv_HAVE_SENDFILE64" 1>&6
|
||||
|
||||
echo $ac_n "checking for linux sendfile support""... $ac_c" 1>&6
|
||||
echo "configure:13959: checking for linux sendfile support" >&5
|
||||
echo "configure:13960: checking for linux sendfile support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_SENDFILE'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13965 "configure"
|
||||
#line 13966 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/sendfile.h>
|
||||
int main() {
|
||||
@ -13973,7 +13974,7 @@ ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_SENDFILE=yes
|
||||
else
|
||||
@ -13989,13 +13990,13 @@ echo "$ac_t""$samba_cv_HAVE_SENDFILE" 1>&6
|
||||
|
||||
# Try and cope with broken Linux sendfile....
|
||||
echo $ac_n "checking for broken linux sendfile support""... $ac_c" 1>&6
|
||||
echo "configure:13993: checking for broken linux sendfile support" >&5
|
||||
echo "configure:13994: checking for broken linux sendfile support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_LINUX_SENDFILE'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13999 "configure"
|
||||
#line 14000 "configure"
|
||||
#include "confdefs.h"
|
||||
\
|
||||
#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
|
||||
@ -14011,7 +14012,7 @@ ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes
|
||||
else
|
||||
@ -14067,13 +14068,13 @@ EOF
|
||||
;;
|
||||
*freebsd*)
|
||||
echo $ac_n "checking for freebsd sendfile support""... $ac_c" 1>&6
|
||||
echo "configure:14071: checking for freebsd sendfile support" >&5
|
||||
echo "configure:14072: checking for freebsd sendfile support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_SENDFILE'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14077 "configure"
|
||||
#line 14078 "configure"
|
||||
#include "confdefs.h"
|
||||
\
|
||||
#include <sys/types.h>
|
||||
@ -14095,7 +14096,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_SENDFILE=yes
|
||||
else
|
||||
@ -14129,13 +14130,13 @@ EOF
|
||||
|
||||
*hpux*)
|
||||
echo $ac_n "checking for hpux sendfile64 support""... $ac_c" 1>&6
|
||||
echo "configure:14133: checking for hpux sendfile64 support" >&5
|
||||
echo "configure:14134: checking for hpux sendfile64 support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_SENDFILE64'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14139 "configure"
|
||||
#line 14140 "configure"
|
||||
#include "confdefs.h"
|
||||
\
|
||||
#include <sys/socket.h>
|
||||
@ -14155,7 +14156,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_SENDFILE64=yes
|
||||
else
|
||||
@ -14186,13 +14187,13 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for hpux sendfile support""... $ac_c" 1>&6
|
||||
echo "configure:14190: checking for hpux sendfile support" >&5
|
||||
echo "configure:14191: checking for hpux sendfile support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_SENDFILE'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14196 "configure"
|
||||
#line 14197 "configure"
|
||||
#include "confdefs.h"
|
||||
\
|
||||
#include <sys/socket.h>
|
||||
@ -14212,7 +14213,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_SENDFILE=yes
|
||||
else
|
||||
@ -14246,13 +14247,13 @@ EOF
|
||||
*solaris*)
|
||||
LIBS="$LIBS -lsendfile"
|
||||
echo $ac_n "checking for solaris sendfilev64 support""... $ac_c" 1>&6
|
||||
echo "configure:14250: checking for solaris sendfilev64 support" >&5
|
||||
echo "configure:14251: checking for solaris sendfilev64 support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_SENDFILEV64'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14256 "configure"
|
||||
#line 14257 "configure"
|
||||
#include "confdefs.h"
|
||||
\
|
||||
#include <sys/sendfile.h>
|
||||
@ -14279,7 +14280,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_SENDFILEV64=yes
|
||||
else
|
||||
@ -14311,13 +14312,13 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for solaris sendfilev support""... $ac_c" 1>&6
|
||||
echo "configure:14315: checking for solaris sendfilev support" >&5
|
||||
echo "configure:14316: checking for solaris sendfilev support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_SENDFILEV'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14321 "configure"
|
||||
#line 14322 "configure"
|
||||
#include "confdefs.h"
|
||||
\
|
||||
#include <sys/sendfile.h>
|
||||
@ -14344,7 +14345,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_SENDFILEV=yes
|
||||
else
|
||||
@ -14385,7 +14386,7 @@ EOF
|
||||
;;
|
||||
esac
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
fi
|
||||
|
||||
@ -14397,7 +14398,7 @@ fi
|
||||
# (WINBIND_STARGETS) and shared libraries (WINBIND_LTARGETS).
|
||||
|
||||
echo $ac_n "checking whether to build winbind""... $ac_c" 1>&6
|
||||
echo "configure:14401: checking whether to build winbind" >&5
|
||||
echo "configure:14402: checking whether to build winbind" >&5
|
||||
|
||||
# Initially, the value of $host_os decides whether winbind is supported
|
||||
|
||||
@ -14493,20 +14494,20 @@ fi
|
||||
# [#include <pwd.h>])
|
||||
|
||||
echo $ac_n "checking whether struct passwd has pw_comment""... $ac_c" 1>&6
|
||||
echo "configure:14497: checking whether struct passwd has pw_comment" >&5
|
||||
echo "configure:14498: checking whether struct passwd has pw_comment" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_passwd_pw_comment'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14503 "configure"
|
||||
#line 14504 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pwd.h>
|
||||
int main() {
|
||||
struct passwd p; p.pw_comment;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:14511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
samba_cv_passwd_pw_comment=yes
|
||||
else
|
||||
@ -14531,20 +14532,20 @@ fi
|
||||
# [#include <pwd.h>])
|
||||
|
||||
echo $ac_n "checking whether struct passwd has pw_age""... $ac_c" 1>&6
|
||||
echo "configure:14535: checking whether struct passwd has pw_age" >&5
|
||||
echo "configure:14536: checking whether struct passwd has pw_age" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_passwd_pw_age'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14541 "configure"
|
||||
#line 14542 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pwd.h>
|
||||
int main() {
|
||||
struct passwd p; p.pw_age;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:14549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
samba_cv_passwd_pw_age=yes
|
||||
else
|
||||
@ -14583,7 +14584,7 @@ fi
|
||||
|
||||
if test x"$INCLUDED_POPT" != x"yes"; then
|
||||
echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
|
||||
echo "configure:14587: checking for poptGetContext in -lpopt" >&5
|
||||
echo "configure:14588: checking for poptGetContext in -lpopt" >&5
|
||||
ac_lib_var=`echo popt'_'poptGetContext | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -14591,7 +14592,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpopt $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14595 "configure"
|
||||
#line 14596 "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
|
||||
@ -14602,7 +14603,7 @@ int main() {
|
||||
poptGetContext()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14607: \"$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
|
||||
@ -14626,7 +14627,7 @@ fi
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether to use included popt""... $ac_c" 1>&6
|
||||
echo "configure:14630: checking whether to use included popt" >&5
|
||||
echo "configure:14631: checking whether to use included popt" >&5
|
||||
if test x"$INCLUDED_POPT" = x"yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
BUILD_POPT='$(POPT_OBJS)'
|
||||
@ -14672,16 +14673,16 @@ fi
|
||||
# final configure stuff
|
||||
|
||||
echo $ac_n "checking configure summary""... $ac_c" 1>&6
|
||||
echo "configure:14676: checking configure summary" >&5
|
||||
echo "configure:14677: checking configure summary" >&5
|
||||
if test "$cross_compiling" = yes; then
|
||||
echo "configure: warning: cannot run when cross-compiling" 1>&2
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14681 "configure"
|
||||
#line 14682 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "${srcdir-.}/tests/summary.c"
|
||||
EOF
|
||||
if { (eval echo configure:14685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:14686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
else
|
||||
|
||||
@ -2737,9 +2737,10 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
|
||||
#################################################
|
||||
# check for sendfile support
|
||||
|
||||
AC_MSG_CHECKING(whether to check for support sendfile)
|
||||
with_sendfile_support=yes
|
||||
AC_MSG_CHECKING(whether to check to support sendfile)
|
||||
AC_ARG_WITH(sendfile-support,
|
||||
[ --with-sendfile-support Check for sendfile support (default=no)],
|
||||
[ --with-sendfile-support Check for sendfile support (default=yes)],
|
||||
[ case "$withval" in
|
||||
yes)
|
||||
|
||||
@ -2957,7 +2958,7 @@ samba_cv_HAVE_SENDFILEV=yes,samba_cv_HAVE_SENDFILEV=no)])
|
||||
AC_MSG_RESULT(no)
|
||||
;;
|
||||
esac ],
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_RESULT(yes)
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -389,9 +389,7 @@ typedef struct
|
||||
BOOL bUseClientDriver;
|
||||
BOOL bDefaultDevmode;
|
||||
BOOL bNTAclSupport;
|
||||
#ifdef WITH_SENDFILE
|
||||
BOOL bUseSendfile;
|
||||
#endif
|
||||
BOOL bProfileAcls;
|
||||
|
||||
char dummy[3]; /* for alignment */
|
||||
@ -513,9 +511,7 @@ static service sDefault = {
|
||||
False, /* bUseClientDriver */
|
||||
False, /* bDefaultDevmode */
|
||||
True, /* bNTAclSupport */
|
||||
#ifdef WITH_SENDFILE
|
||||
False, /* bUseSendfile */
|
||||
#endif
|
||||
False, /* bProfileAcls */
|
||||
|
||||
"" /* dummy */
|
||||
@ -872,9 +868,7 @@ static struct parm_struct parm_table[] = {
|
||||
{"strict sync", P_BOOL, P_LOCAL, &sDefault.bStrictSync, NULL, NULL, FLAG_SHARE},
|
||||
{"sync always", P_BOOL, P_LOCAL, &sDefault.bSyncAlways, NULL, NULL, FLAG_SHARE},
|
||||
{"use mmap", P_BOOL, P_GLOBAL, &Globals.bUseMmap, NULL, NULL, FLAG_DEVELOPER},
|
||||
#ifdef WITH_SENDFILE
|
||||
{"use sendfile", P_BOOL, P_LOCAL, &sDefault.bUseSendfile, NULL, NULL, FLAG_SHARE},
|
||||
#endif
|
||||
{"hostname lookups", P_BOOL, P_GLOBAL, &Globals.bHostnameLookups, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
{"write cache size", P_INTEGER, P_LOCAL, &sDefault.iWriteCacheSize, NULL, NULL, FLAG_SHARE},
|
||||
|
||||
@ -1783,9 +1777,7 @@ FN_LOCAL_BOOL(lp_inherit_acls, bInheritACLS)
|
||||
FN_LOCAL_BOOL(lp_use_client_driver, bUseClientDriver)
|
||||
FN_LOCAL_BOOL(lp_default_devmode, bDefaultDevmode)
|
||||
FN_LOCAL_BOOL(lp_nt_acl_support, bNTAclSupport)
|
||||
#ifdef WITH_SENDFILE
|
||||
FN_LOCAL_BOOL(lp_use_sendfile, bUseSendfile)
|
||||
#endif
|
||||
FN_LOCAL_BOOL(lp_profile_acls, bProfileAcls)
|
||||
FN_LOCAL_INTEGER(lp_create_mask, iCreate_mask)
|
||||
FN_LOCAL_INTEGER(lp_force_create_mode, iCreate_force_mode)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user