summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2012-09-14 00:02:22 +0200
committerBjoern Jacke <bj@sernet.de>2012-09-14 01:04:03 +0200
commit70bc93650f86a76c6f1617139cb71539c76abf42 (patch)
treeaaa25aa0033ec1ebd29509abc718e132ce68ffbd
parent86a4ca28649141f77556208b833db2e076c0125d (diff)
downloadsamba-70bc93650f86a76c6f1617139cb71539c76abf42.tar.gz
samba-70bc93650f86a76c6f1617139cb71539c76abf42.tar.bz2
samba-70bc93650f86a76c6f1617139cb71539c76abf42.zip
autoconf: fix --with(out)-sendfile-support option handling
this fixes bug #8344
-rw-r--r--source3/configure.in35
1 files changed, 20 insertions, 15 deletions
diff --git a/source3/configure.in b/source3/configure.in
index e6a13102d5..a6cc4440f1 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.