From c13d2d278a324ece23c0aebe6128b1c9c5b37ca7 Mon Sep 17 00:00:00 2001 From: kamei Date: Sat, 9 Mar 2013 10:43:43 +0900 Subject: [PATCH] Strictly check --with-sendfile-support --- source3/configure.in | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/source3/configure.in b/source3/configure.in index 9d7fb5d..d195ee9 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -5790,7 +5790,7 @@ samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)]) if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() support is available]) AC_DEFINE(FREEBSD_SENDFILE_API,1,[Whether the FreeBSD sendfile() API is available]) - AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be included]) + AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used]) else AC_MSG_RESULT(no); fi @@ -5817,7 +5817,7 @@ samba_cv_HAVE_SENDFILE64=yes,samba_cv_HAVE_SENDFILE64=no)]) if test x"$samba_cv_HAVE_SENDFILE64" = x"yes"; then AC_DEFINE(HAVE_SENDFILE64,1,[Whether sendfile64() is available]) AC_DEFINE(HPUX_SENDFILE_API,1,[Whether the hpux sendfile() API is available]) - AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be included]) + AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used]) else AC_MSG_RESULT(no); fi @@ -5842,7 +5842,7 @@ samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)]) if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available]) AC_DEFINE(HPUX_SENDFILE_API,1,[Whether the hpux sendfile() API is available]) - AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be included]) + AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used]) else AC_MSG_RESULT(no); fi @@ -5878,7 +5878,7 @@ samba_cv_HAVE_SENDFILEV64=yes,samba_cv_HAVE_SENDFILEV64=no)]) if test x"$samba_cv_HAVE_SENDFILEV64" = x"yes"; then AC_DEFINE(HAVE_SENDFILEV64,1,[Whether sendfilev64() is available]) AC_DEFINE(SOLARIS_SENDFILE_API,1,[Whether the soloris sendfile() API is available]) - AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be included]) + AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used]) else AC_MSG_RESULT(no); fi @@ -5911,7 +5911,7 @@ samba_cv_HAVE_SENDFILEV=yes,samba_cv_HAVE_SENDFILEV=no)]) if test x"$samba_cv_HAVE_SENDFILEV" = x"yes"; then AC_DEFINE(HAVE_SENDFILEV,1,[Whether sendfilev() is available]) AC_DEFINE(SOLARIS_SENDFILE_API,1,[Whether the solaris sendfile() API is available]) - AC_DEFINE(WITH_SENDFILE,1,[Whether to include sendfile() support]) + AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used]) else AC_MSG_RESULT(no); fi @@ -5941,7 +5941,7 @@ samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)]) if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available]) AC_DEFINE(AIX_SENDFILE_API,1,[Whether the AIX send_file() API is available]) - AC_DEFINE(WITH_SENDFILE,1,[Whether to include sendfile() support]) + AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used]) else AC_MSG_RESULT(no); fi @@ -5951,8 +5951,13 @@ samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)]) 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 ) +if test x$with_sendfile_support = xyes; then + if test x"$samba_cv_HAVE_SENDFILE" != xyes -a \ + x"$samba_cv_HAVE_SENDFILE64" != xyes -a \ + x"$samba_cv_HAVE_SENDFILEV" != xyes -a \ + x"$samba_cv_HAVE_SENDFILEV64" != xyes ; then + AC_MSG_ERROR(sendfile support requested but sendfile not available ) + fi fi ############################################ -- 1.7.10.4