Changeset 1457

Timestamp:

11/18/2006 05:06:25 PM (22 months ago)

Author:

jan

Message:

added check for aio_suspend and the lib providing it to configure

Location:

trunk

Files:

• configure.in (modified) (2 diffs)
• src/Makefile.am (modified) (2 diffs)

trunk/configure.in

@@ -408 +408 @@
 fi
 
-dnl Check for memcache
+dnl Check for libaio
 AC_MSG_CHECKING(for libaio)
 AC_ARG_WITH(linux-aio, AC_HELP_STRING([--with-linux-aio],[Async IO support for Linux via libaio]),
@@ -424 +424 @@
 fi
  
+ AC_SEARCH_LIBS(aio_suspend, rt, [
+         AC_CHECK_HEADERS([aio.h],[
+                 if test "$ac_cv_search_aio_suspend" != no; then
+                   test "$ac_cv_search_aio_suspend" = "none required" || POSIX_AIO_LIB="$ac_cv_search_aio_suspend -pthread"
+                 fi
+
+                 AC_DEFINE([HAVE_LIBRT], [1], [librt])
+                 AC_DEFINE([HAVE_AIO_H], [1], [aio.h])
+         ])
+ ])
+ AC_SUBST(POSIX_AIO_LIB)
+
 save_LIBS=$LIBS
 AC_SEARCH_LIBS(crypt,crypt,[

trunk/src/Makefile.am

@@ -66 +66 @@
       network_solaris_sendfilev.c network_openssl.c \
       network_linux_aio.c \
+      network_posix_aio.c \
       splaytree.c \
       http_resp.c http_resp_parser.c \
@@ -305 +306 @@
 
 lighttpd_SOURCES = $(src)
-lighttpd_LDADD = $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(common_libadd) $(SSL_LIB) $(FAM_LIBS) $(AIO_LIB)
+lighttpd_LDADD = $(PCRE_LIB) $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) $(common_libadd) $(SSL_LIB) $(FAM_LIBS) $(AIO_LIB) $(POSIX_AIO_LIB)
 lighttpd_LDFLAGS = -export-dynamic
 lighttpd_CCPFLAGS = $(FAM_CFLAGS)