r2323 - branches/1.1

[des at projects.linpro.no]

Author: des
Date: 2007-12-20 14:35:42 +0100 (Thu, 20 Dec 2007)
New Revision: 2323

Modified:
   branches/1.1/
   branches/1.1/configure.ac
Log:
Merged revisions 2322 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2322 | des | 2007-12-20 14:35:33 +0100 (Thu, 20 Dec 2007) | 2 lines
  
  Only look for sendfile() on platforms where we know how to use it.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2306,2310,2313-2314,2316,2318,2320
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2306,2310,2313-2314,2316,2318,2320,2322

Modified: branches/1.1/configure.ac
===================================================================
--- branches/1.1/configure.ac	2007-12-20 13:35:33 UTC (rev 2322)
+++ branches/1.1/configure.ac	2007-12-20 13:35:42 UTC (rev 2323)
@@ -92,8 +92,17 @@
 AC_FUNC_STRERROR_R
 AC_CHECK_FUNCS([socket])
 AC_CHECK_FUNCS([strptime])
-AC_CHECK_FUNCS([sendfile])
 
+# This one is tricky, there are multiple versions
+case $host in
+*-*-freebsd*|*-*-linux*)
+	AC_CHECK_FUNCS([sendfile])
+ 	;;
+*)
+	AC_MSG_WARN([won't look for sendfile() on $host])
+	;;
+esac
+
 # These functions are provided by libcompat on platforms where they
 # are not available
 AC_CHECK_FUNCS([asprintf vasprintf])