nginx-0.0.1-2003-11-27-22:01:37 import
diff --git a/auto/func b/auto/func
index 5cde428..5a291d8 100644
--- a/auto/func
+++ b/auto/func
@@ -9,7 +9,7 @@
 echo "$NGX_FUNC_INC" >> autotest.c
 echo "int main() { $NGX_FUNC_TEST; return 0; }" >> autotest.c
 
-eval "$CC $CC_TEST_FLAGS -o autotest autotest.c > $NGX_ERR 2>&1"
+eval "$CC $CC_TEST_FLAGS -o autotest autotest.c $NGX_FUNC_LIBS > $NGX_ERR 2>&1"
 
 if [ -x autotest ]; then
     echo " + $NGX_FUNC found"
diff --git a/auto/os/linux b/auto/os/linux
index a488c4d..bf5092a 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -9,8 +9,7 @@
 
 # TODO check sendfile64()
 
-#CC_TEST_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
-CC_TEST_FLAGS="-D_GNU_SOURCE"
+CC_TEST_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
 # STUB
 CORE_SRCS="$CORE_SRCS $LINUX_SENDFILE_SRCS"
diff --git a/auto/os/solaris b/auto/os/solaris
index 008eda6..6bc2a6f 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -22,6 +22,7 @@
 
 
 NGX_FUNC_INC="#include <sys/sendfile.h>"
+NGX_FUNC_LIBS="-lsendfile"
 NGX_FUNC_TEST="int fd = 1; sendfilevec_t vec[1];
                size_t sent = 1; ssize_t n;
                n = sendfilev(fd, vec, 1, &sent)"