From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 11 Nov 2009 10:09:30 +0000 (+1300)
Subject: Author: Henrik Nordstrom <henrik@henriknordstrom.net>
X-Git-Tag: SQUID_3_1_0_15~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53d670db56dc15e2d27979209ec8efeeaf4212b3;p=thirdparty%2Fsquid.git

Author: Henrik Nordstrom <henrik@henriknordstrom.net>
Generalize disk-io OS libraries into DISK_OS_LIBS

Used for disk-io related system libraries. Replaces older AIOLIB which
was unique to -lrt.

This solves dependency issues. We can not have dependencies on system
libraries as that fails for some sometimes..
---

diff --git a/configure.in b/configure.in
index 5bf5241c7d..a3b3cd3c3d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl  Configuration input file for Squid
+
 dnl
 dnl  $Id$
 dnl
@@ -474,6 +474,7 @@ FOUND_DISKIO_BLOCKING=
 FOUND_DISKIO_DISKDAEMON=
 FOUND_DISKIO_DISKTHREADS=
 DISK_LIBS=
+DISK_OS_LIBS=
 DISK_MODULES=
 DISK_LINKOBJS=
 for module in $MAYBE_DISK_MODULES none; do
@@ -548,7 +549,7 @@ 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"
 				])
@@ -561,7 +562,8 @@ for module in $MAYBE_DISK_MODULES none; do
 	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
@@ -622,6 +624,7 @@ for module in $MAYBE_DISK_MODULES none; do
 		;;
 	    *)
 		AC_MSG_NOTICE([Enabling AIO DiskIO module])
+		DISK_OS_LIBS="$DISK_OS_LIBS $AIOLIB"
 		;;
 	  esac
 	else
@@ -653,7 +656,7 @@ AC_SUBST(DISK_MODULES)
 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])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 17503f56e7..ed0c092ec1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -525,7 +525,7 @@ squid_LDADD = \
 	@DISK_LINKOBJS@ \
 	@REPL_OBJS@ \
 	@DISK_LIBS@ \
-	@AIOLIB@ \
+	@DISK_OS_LIBS@ \
 	@CRYPTLIB@ \
 	@REGEXLIB@ \
 	@SNMPLIB@ \
@@ -1207,7 +1207,7 @@ nodist_tests_testDiskIO_SOURCES= \
 tests_testDiskIO_LDADD = \
 	$(SWAP_TEST_LDADD) \
 	@DISK_LIBS@ \
-	@AIOLIB@ \
+	@DISK_OS_LIBS@ \
 	$(COMMON_LIBS) \
 	SquidConfig.o \
 	@XTRA_LIBS@
@@ -1215,7 +1215,6 @@ tests_testDiskIO_LDADD = \
 tests_testDiskIO_LDFLAGS = $(LIBADD_DL)
 tests_testDiskIO_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
 	@DISK_LIBS@ \
-	@AIOLIB@ \
 	$(SWAP_TEST_DS) \
 	@SQUID_CPPUNIT_LA@
 
@@ -1952,7 +1951,7 @@ SWAP_TEST_LDADD = \
 	$(COMMON_LIBS) \
 	@REPL_OBJS@ \
 	@DISK_LIBS@ \
-	@AIOLIB@ \
+	@DISK_OS_LIBS@ \
 	-L../lib -lmiscutil \
 	acl/libapi.la \
 	@SQUID_CPPUNIT_LIBS@ \
@@ -1961,7 +1960,6 @@ SWAP_TEST_DS =\
 	$(top_builddir)/lib/libmiscutil.a \
 	repl_modules.o \
 	@DISK_LIBS@ \
-	@AIOLIB@ \
 	$(COMMON_LIBS) \
 	@REPL_OBJS@ \
 	@SQUID_CPPUNIT_LA@