From: wessels <>
Date: Wed, 31 Dec 1997 12:06:22 +0000 (+0000)
Subject: From:    Stewart Forster <slf@connect.com.au>
X-Git-Tag: SQUID_3_0_PRE1~4328
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71f8abc822575c632d71122d9e5b634d7f15f83f;p=thirdparty%2Fsquid.git

From:    Stewart Forster <slf@connect.com.au>
In the default makefile, there is no mention of needing to include
-lpthread for Solaris (I don't know about other OS's).  This WILL
cause squid to fail under Solaris, and the standard C library has
non-reentrant routines that will die unless the appropriate thread
library is included.
---

diff --git a/configure.in b/configure.in
index 621d285f23..f60bd02e03 100644
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.85 1997/12/30 02:49:41 wessels Exp $
+dnl  $Id: configure.in,v 1.86 1997/12/31 05:06:22 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.85 $)dnl
+AC_REVISION($Revision: 1.86 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -268,6 +268,11 @@ dnl We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
 AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
 AC_SUBST(CRYPTLIB)
 
+dnl Check for libcrypt
+dnl We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
+AC_CHECK_LIB(pthread, main, [PTHREADLIB="-lpthread"])
+AC_SUBST(PTHREADLIB)
+
 dnl System-specific library modifications
 dnl
 case "$host" in
diff --git a/src/Makefile.in b/src/Makefile.in
index 128822fe17..8a663d0974 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.109 1997/12/31 04:11:56 wessels Exp $
+#  $Id: Makefile.in,v 1.110 1997/12/31 05:06:23 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -48,6 +48,7 @@ LN_S		= @LN_S@
 PERL            = @PERL@
 CRYPTLIB	= @CRYPTLIB@
 REGEXLIB	= @REGEXLIB@
+PTHREADLIB	= @PTHREADLIB@
 AC_CFLAGS	= @CFLAGS@
 LDFLAGS		= @LDFLAGS@
 XTRA_LIBS	= @XTRA_LIBS@
@@ -59,7 +60,8 @@ SHELL		= /bin/sh
 
 INCLUDE		= -I. -I../include -I$(srcdir)/../include
 CFLAGS 		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
-SQUID_LIBS	= -L../lib $(CRYPTLIB) $(REGEXLIB) -lmiscutil $(XTRA_LIBS)
+SQUID_LIBS	= -L../lib $(CRYPTLIB) $(REGEXLIB) $(PTHREADLIB) \
+		  -lmiscutil $(XTRA_LIBS)
 CLIENT_LIBS	= -L../lib -lmiscutil $(XTRA_LIBS)
 DNSSERVER_LIBS	= -L../lib -lmiscutil $(XTRA_LIBS)
 PINGER_LIBS	= -L../lib -lmiscutil $(XTRA_LIBS)