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

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 (modified) (3 diffs)

branches/samba-3.5.x/source3/configure

@@ -1783 +1783 @@
   --with-acl-support      Include ACL support (default=auto)
   --with-aio-support      Include asynchronous io support (default=no)
-  --with-sendfile-support Check for sendfile support (default=yes)
+  --with-sendfile-support Whether sendfile support should be built in
+                          (default=auto)
   --with-wbclient         Use external wbclient (optional)
   --with-winbind          Build winbind (default, if supported by OS)
@@ -33568 +33569 @@
 # check for sendfile support
 
-with_sendfile_support=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to check to support sendfile" >&5
-$as_echo_n "checking whether to check to support sendfile... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sendfile support should be built in" >&5
+$as_echo_n "checking whether sendfile support should be built in... " >&6; }
 
 # Check whether --with-sendfile-support was given.
 if test "${with_sendfile_support+set}" = set; then :
   withval=$with_sendfile_support;  case "$withval" in
-  yes)
-
+  yes|no)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+$as_echo "$withval" >&6; };
+        with_sendfile_support=$withval
+        ;;
+  *)
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
-
-        case "$host_os" in
+$as_echo "yes" >&6; }
+        with_sendfile_support=auto
+        ;;
+  esac
+fi
+
+
+if test x$with_sendfile_support != xno ; then
+    case "$host_os" in
         *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linux sendfile64 support" >&5
@@ -34126 +34136 @@
         *)
         ;;
-        esac
-        ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
+    esac
+fi
+
+if test x$with_sendfile_support = xyes -a x"$samba_cv_HAVE_SENDFILE" != xyes ; then
+        as_fn_error $? "sendfile support requested but sendfile not available " "$LINENO" 5
+fi
 
 ############################################