Changeset 1413

Timestamp:

11/11/2006 09:02:24 PM (22 months ago)

Author:

jan

Message:

added configure checks for libaio

Location:

trunk

Files:

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

trunk/configure.in

@@ -408 +408 @@
 fi
 
+dnl Check for memcache
+AC_MSG_CHECKING(for libaio)
+AC_ARG_WITH(linux-aio, AC_HELP_STRING([--with-linux-aio],[Async IO support for Linux via libaio]),
+[WITH_LINUXLIBAIO=$withval],[WITH_LINUXLIBAIO=no])
+AC_MSG_RESULT([$WITH_LINUXLIBAIO])
+if test "$WITH_LINUXLIBAIO" != "no"; then
+ AC_CHECK_LIB(aio, io_submit, [
+         AC_CHECK_HEADERS([libaio.h],[
+                 AIO_LIB="-laio -pthread"
+                 AC_DEFINE([HAVE_LIBAIO], [1], [libaio])
+                 AC_DEFINE([HAVE_LIBAIO_H], [1], [libaio.h])
+         ])
+ ])
+ AC_SUBST(AIO_LIB)
+fi
+ 
 save_LIBS=$LIBS
 AC_SEARCH_LIBS(crypt,crypt,[
@@ -647 +663 @@
 fi
 
+features="linux-libaio"
+if test ! "x$AIO_LIB" = x; then
+        enable_feature="$enable_feature $features"
+else
+        disable_feature="$disable_feature $features"
+fi
+
+
 
 ## output

trunk/src/Makefile.am

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