Changeset 739 for branches/samba-3.5.x/source3/configure.in

Timestamp:

Nov 12, 2012, 7:37:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.19

File:

• branches/samba-3.5.x/source3/configure.in (modified) (2 diffs)

branches/samba-3.5.x/source3/configure.in

@@ -5715 +5715 @@
 # 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);
-
-        case "$host_os" in
+  yes|no)
+        AC_MSG_RESULT($withval);
+        with_sendfile_support=$withval
+        ;;
+  *)
+        AC_MSG_RESULT(yes)
+        with_sendfile_support=auto
+        ;;
+  esac ],
+)
+
+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,[
@@ -5960 +5967 @@
         *)
         ;;
-        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
 
 ############################################