changeset 981:7e9b90bfe78c HEAD

If Solaris sendfilev() is found, don't try checking for Linux one. Linux check some reason passes with sendfile-enabled Solaris..
author Timo Sirainen <tss@iki.fi>
date Thu, 16 Jan 2003 00:08:19 +0200
parents dd4b74885c43
children 4937e278489c
files configure.in
diffstat 1 files changed, 33 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Wed Jan 15 17:43:22 2003 +0200
+++ b/configure.in	Thu Jan 16 00:08:19 2003 +0200
@@ -497,39 +497,6 @@
   AC_MSG_RESULT(no)
 ])
 
-dnl * Linux compatible sendfile()
-AC_MSG_CHECKING([Linux compatible sendfile()])
-AC_TRY_COMPILE([
-  #undef _FILE_OFFSET_BITS
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <sys/uio.h>
-  #include <sys/sendfile.h>
-], [
-  sendfile(0, 0, (void *) 0, 0);
-], [
-  AC_DEFINE(HAVE_LINUX_SENDFILE,, Define if you have Linux-compatible sendfile())
-  AC_MSG_RESULT(yes)
-], [
-  AC_MSG_RESULT(no)
-])
-
-dnl * FreeBSD compatible sendfile()
-AC_MSG_CHECKING([FreeBSD compatible sendfile()])
-AC_TRY_COMPILE([
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <sys/uio.h>
-], [
-  struct sf_hdtr hdtr;
-  sendfile(0, 0, 0, 0, &hdtr, (void *) 0, 0);
-], [
-  AC_DEFINE(HAVE_FREEBSD_SENDFILE,, Define if you have FreeBSD-compatible sendfile())
-  AC_MSG_RESULT(yes)
-], [
-  AC_MSG_RESULT(no)
-])
-
 dnl * Solaris compatible sendfilev()
 AC_MSG_CHECKING([Solaris compatible sendfilev()])
 AC_CHECK_LIB(sendfile, sendfilev, [
@@ -538,6 +505,39 @@
   AC_MSG_RESULT(yes)
 ], [
   AC_MSG_RESULT(no)
+
+  dnl * Linux compatible sendfile() - don't check if Solaris one was found.
+  dnl * This seems to pass with Solaris for some reason..
+  AC_MSG_CHECKING([Linux compatible sendfile()])
+  AC_TRY_COMPILE([
+    #undef _FILE_OFFSET_BITS
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <sys/sendfile.h>
+  ], [
+    sendfile(0, 0, (void *) 0, 0);
+  ], [
+    AC_DEFINE(HAVE_LINUX_SENDFILE,, Define if you have Linux-compatible sendfile())
+    AC_MSG_RESULT(yes)
+  ], [
+    AC_MSG_RESULT(no)
+  ])
+
+  dnl * FreeBSD compatible sendfile()
+  AC_MSG_CHECKING([FreeBSD compatible sendfile()])
+  AC_TRY_COMPILE([
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <sys/uio.h>
+  ], [
+    struct sf_hdtr hdtr;
+    sendfile(0, 0, 0, 0, &hdtr, (void *) 0, 0);
+  ], [
+    AC_DEFINE(HAVE_FREEBSD_SENDFILE,, Define if you have FreeBSD-compatible sendfile())
+    AC_MSG_RESULT(yes)
+  ], [
+    AC_MSG_RESULT(no)
+  ])
 ])
 
 dnl ***