-dnl Configuration input file for Squid
+
dnl
dnl $Id$
dnl
FOUND_DISKIO_DISKDAEMON=
FOUND_DISKIO_DISKTHREADS=
DISK_LIBS=
+DISK_OS_LIBS=
DISK_MODULES=
DISK_LINKOBJS=
for module in $MAYBE_DISK_MODULES none; do
*)
SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT"
SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT"
- AC_CHECK_LIB(pthread, main,[DISK_LIBS="$DISK_LIBS -lpthread"],
+ AC_CHECK_LIB(pthread, main,[LIBPTHREADS="-lpthread"],
[ AC_MSG_NOTICE(pthread library required but cannot be found.)
use_diskthreads="no"
])
if test "$use_diskthreads" = "yes" ; then
AC_DEFINE(USE_DISKIO_DISKTHREADS, 1, [Whether pthreads support is needed. Automatic])
AC_MSG_NOTICE([Enabling DiskThreads DiskIO module])
- DISK_LIBS="$DISK_LIBS $LIBPTHREADS libDiskThreads.a"
+ DISK_LIBS="$DISK_LIBS libDiskThreads.a"
+ DISK_OS_LIBS="$DISK_OS_LIBS $LIBPTHREADS"
DISK_MODULES="$DISK_MODULES DiskThreads"
DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/DiskThreads/DiskThreadsDiskIOModule.o"
else
;;
*)
AC_MSG_NOTICE([Enabling AIO DiskIO module])
+ DISK_OS_LIBS="$DISK_OS_LIBS $AIOLIB"
;;
esac
else
AC_SUBST(DISK_LIBS)
AC_SUBST(DISK_PROGRAMS)
AC_SUBST(DISK_LINKOBJS)
-AC_SUBST(AIOLIB)
+AC_SUBST(DISK_OS_LIBS)
AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1])
AM_CONDITIONAL([USE_AIO_WIN32], [test "$USE_AIO_WIN32" = 1])
@DISK_LINKOBJS@ \
@REPL_OBJS@ \
@DISK_LIBS@ \
- @AIOLIB@ \
+ @DISK_OS_LIBS@ \
@CRYPTLIB@ \
@REGEXLIB@ \
@SNMPLIB@ \
tests_testDiskIO_LDADD = \
$(SWAP_TEST_LDADD) \
@DISK_LIBS@ \
- @AIOLIB@ \
+ @DISK_OS_LIBS@ \
$(COMMON_LIBS) \
SquidConfig.o \
@XTRA_LIBS@
tests_testDiskIO_LDFLAGS = $(LIBADD_DL)
tests_testDiskIO_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@DISK_LIBS@ \
- @AIOLIB@ \
$(SWAP_TEST_DS) \
@SQUID_CPPUNIT_LA@
$(COMMON_LIBS) \
@REPL_OBJS@ \
@DISK_LIBS@ \
- @AIOLIB@ \
+ @DISK_OS_LIBS@ \
-L../lib -lmiscutil \
acl/libapi.la \
@SQUID_CPPUNIT_LIBS@ \
$(top_builddir)/lib/libmiscutil.a \
repl_modules.o \
@DISK_LIBS@ \
- @AIOLIB@ \
$(COMMON_LIBS) \
@REPL_OBJS@ \
@SQUID_CPPUNIT_LA@