From: Björn Jacke <bj@sernet.de>
Date: Thu, 13 Sep 2012 22:02:22 +0000 (+0200)
Subject: autoconf: fix --with(out)-sendfile-support option handling
X-Git-Tag: samba-3.5.19~6
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=a812254ce8bbe67234a185054661e6c2f01b1134

autoconf: fix --with(out)-sendfile-support option handling

this fixes bug #8344
(cherry picked from commit a1db9aada46e2e7eefc989f888d22650320533de)
(cherry picked from commit f156a357e6af0aaa6b1bcddc521761d43409e70f)
---

diff --git a/source3/configure.in b/source3/configure.in
index 24945936d92..9d7fb5ddeb3 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5696,16 +5696,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 sendfile64 support],samba_cv_HAVE_SENDFILE64,[
 		AC_TRY_LINK([#include <sys/sendfile.h>],
@@ -5941,14 +5948,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.