The branch, v4-0-test has been updated
via ba24443 autoconf: fix --with(out)-sendfile-support option handling
from 90021dc Remove obsolete land-remote.py and land.py scripts.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit ba244438433add3d05a01423196780700c6a7308
Author: Björn Jacke <[email protected]>
Date: Fri Sep 14 00:02:22 2012 +0200
autoconf: fix --with(out)-sendfile-support option handling
this fixes bug #8344
(cherry picked from commit 70bc93650f86a76c6f1617139cb71539c76abf42)
Autobuild-User(v4-0-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-0-test): Wed Oct 10 12:36:03 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index e6a1310..a6cc444 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5443,16 +5443,23 @@ fi
#################################################
# check for sendfile support
-with_sendfile_support=yes
-AC_MSG_CHECKING(whether to check to support sendfile)
+AC_MSG_CHECKING(whether sendfile support should be built in)
AC_ARG_WITH(sendfile-support,
-[AS_HELP_STRING([--with-sendfile-support], [Check for sendfile support
(default=yes)])],
+[AS_HELP_STRING([--with-sendfile-support], [Whether sendfile support should be
built in (default=auto)])],
[ case "$withval" in
- yes)
-
- AC_MSG_RESULT(yes);
+ yes|no)
+ AC_MSG_RESULT($withval);
+ with_sendfile_support=$withval
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ with_sendfile_support=auto
+ ;;
+ esac ],
+)
- case "$host_os" in
+if test x$with_sendfile_support != xno ; then
+ case "$host_os" in
*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
AC_CACHE_CHECK([for linux sendfile
support],samba_cv_HAVE_SENDFILE,[
AC_TRY_LINK([#include <sys/sendfile.h>],
@@ -5629,14 +5636,12 @@ samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
;;
*)
;;
- esac
- ;;
- *)
- AC_MSG_RESULT(no)
- ;;
- esac ],
- AC_MSG_RESULT(yes)
-)
+ esac
+fi
+
+if test x$with_sendfile_support = xyes -a x"$samba_cv_HAVE_SENDFILE" != xyes ;
then
+ AC_MSG_ERROR(sendfile support requested but sendfile not available )
+fi
############################################
# See if we have the Linux readahead syscall.
--
Samba Shared Repository
