From 05fb78a0bacab28a67d262dfb2072a0a73eb16cc Mon Sep 17 00:00:00 2001 From: kamei Date: Sat, 9 Mar 2013 10:49:16 +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 0f805ee..cf2b071 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6041,7 +6041,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 @@ -6068,7 +6068,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 @@ -6093,7 +6093,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 @@ -6129,7 +6129,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 @@ -6162,7 +6162,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 @@ -6192,7 +6192,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 @@ -6202,8 +6202,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