[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  84f29b8 s3:waf add sendfile support for Tru64, which is the same as HP-UX's
       via  13aaa94 s3: add sendfile support for Tru64, which is the same as HP-UX's
      from  f81fd1c Try and fix the autoconf build on Solaris/Nexenta/etc.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 84f29b814d1786147020867214974deefbb8412a
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Jun 29 23:43:56 2012 +0200

    s3:waf add sendfile support for Tru64, which is the same as HP-UX's
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Sat Jun 30 02:22:21 CEST 2012 on sn-devel-104

commit 13aaa9410b92159c24a4d6f45ecfd902f9a4941e
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Jun 29 23:36:24 2012 +0200

    s3: add sendfile support for Tru64, which is the same as HP-UX's

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |    6 +++---
 source3/wscript      |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index a9640d8..e55114d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5594,8 +5594,8 @@ samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
 	fi
 	;;
 
-	*hpux*)
-		AC_CACHE_CHECK([for hpux sendfile support],samba_cv_HAVE_SENDFILE,[
+	*hpux*|*osf*)
+		AC_CACHE_CHECK([for osf/hpux sendfile support],samba_cv_HAVE_SENDFILE,[
 		AC_TRY_LINK([\
 #include <sys/socket.h>
 #include <sys/uio.h>],
@@ -5614,7 +5614,7 @@ samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
 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(HPUX_SENDFILE_API,1,[Whether the osf/hpux sendfile() API is available])
 		AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be included])
 	else
 		AC_MSG_RESULT(no);
diff --git a/source3/wscript b/source3/wscript
index cc05095..8f2453f 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -1004,7 +1004,7 @@ main() {
                 conf.DEFINE('HAVE_SENDFILE', '1')
                 conf.DEFINE('FREEBSD_SENDFILE_API', '1')
                 conf.DEFINE('WITH_SENDFILE', '1')
-        elif (host_os.rfind('hpux') > -1):
+        elif (host_os.rfind('hpux') > -1) or (host_os.rfind('osf') > -1):
             conf.CHECK_CODE('''
                             #include <sys/socket.h>
                             #include <sys/uio.h>
@@ -1018,7 +1018,7 @@ main() {
                             nwritten = sendfile(tofd, fromfd, offset, total, &hdtrl[0], 0);
                             ''',
                             '_HAVE_SENDFILE',
-                            msg='Checking for hpux sendfile support')
+                            msg='Checking for osf/hpux sendfile support')
             if conf.CONFIG_SET('_HAVE_SENDFILE'):
                 conf.DEFINE('HAVE_SENDFILE', '1')
                 conf.DEFINE('HPUX_SENDFILE_API', '1')


-- 
Samba Shared Repository