Attachment 7894 Details for Bug 8344 – patch for 3.5 and 3.6

[patch] patch for 3.5 and 3.6

0001-autoconf-fix-with-out-sendfile-support-option-handli.patch (text/plain), 1.91 KB, created by Björn Jacke on 2012-09-13 22:16:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2012-09-13 22:16:08 UTC

Size: 1.91 KB

patch

obsolete

>From 1c1a3b7324da735ac1df4570e162ff0322c2c25c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Fri, 14 Sep 2012 00:02:22 +0200
>Subject: [PATCH] autoconf: fix --with(out)-sendfile-support option handling
>
>this fixes bug #8344
>---
> source3/configure.in | 35 ++++++++++++++++++++---------------
> 1 file changed, 20 insertions(+), 15 deletions(-)
>
>diff --git a/source3/configure.in b/source3/configure.in
>index 2494593..9d7fb5d 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.
>-- 
>1.7.11.5
>

Flags:

metze: review+

Actions: View

Attachments on bug 8344: 7894 | 8037