[dovecot-cvs] dovecot configure.in,1.88,1.89

[cras at procontrol.fi]

Update of /home/cvs/dovecot
In directory danu:/tmp/cvs-serv12289

Modified Files:
	configure.in 
Log Message:
If Solaris sendfilev() is found, don't try checking for Linux one. Linux
check some reason passes with sendfile-enabled Solaris..



Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- configure.in	14 Jan 2003 20:59:57 -0000	1.88
+++ configure.in	15 Jan 2003 22:08:19 -0000	1.89
@@ -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 ***