---------------------
PatchSet 545 
Date: 2000/08/19 14:43:18
Author: hno
Branch: hno-devel
Tag: (none) 
Log:
Added a check for libdl to allow pam_auth to build on platforms where
-ldl is not required.

Members: 
	configure.in:1.1.1.3.6.7.2.20->1.1.1.3.6.7.2.21 
	auth_modules/PAM/Makefile.in:1.1.1.1.6.1->1.1.1.1.6.2 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.1.1.3.6.7.2.20
retrieving revision 1.1.1.3.6.7.2.21
diff -u -r1.1.1.3.6.7.2.20 -r1.1.1.3.6.7.2.21
--- squid/configure.in	19 Aug 2000 13:34:31 -0000	1.1.1.3.6.7.2.20
+++ squid/configure.in	19 Aug 2000 14:43:18 -0000	1.1.1.3.6.7.2.21
@@ -3,13 +3,13 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.1.1.3.6.7.2.20 2000/08/19 13:34:31 hno Exp $
+dnl  $Id: configure.in,v 1.1.1.3.6.7.2.21 2000/08/19 14:43:18 hno Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.1.1.3.6.7.2.20 $)dnl
+AC_REVISION($Revision: 1.1.1.3.6.7.2.21 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -1042,18 +1042,16 @@
 
 dnl Check for libcrypt
 dnl We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
-AC_CHECK_LIB(crypt, crypt)
-if test $ac_cv_lib_crypt_crypt = "yes"; then
-  CRYPTLIB="-lcrypt"
-fi
+AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
 AC_SUBST(CRYPTLIB)
 
+dnl Check for libdl, used by auth_modules/PAM
+AC_CHECK_LIB(dl, dlopen, [DLLIB="-ldl"])
+AC_SUBST(DLLIB)
+
 dnl Check for pthreads
 dnl We use pthreads when doing ASYNC I/O
-AC_CHECK_LIB(pthread, main)
-if test $ac_cv_lib_pthread_main = "yes"; then
-  PTHREADLIB="-lpthread"
-fi
+AC_CHECK_LIB(pthread, main, [PTHREADLIB="-lpthread"])
 AC_SUBST(PTHREADLIB)
 
 dnl -lintl is needed on SCO version 3.2v4.2 for strftime()
@@ -1659,10 +1657,6 @@
 
 if test -z "$XTRA_LIBS"; then
 	XTRA_LIBS="$LIBS"
-	dnl -lcrypt is set in CRYPTLIB
-	XTRA_LIBS=`echo $XTRA_LIBS | sed -e "s/-lcrypt//"`
-	dnl -lpthread is set in PTHREADLIB
-	XTRA_LIBS=`echo $XTRA_LIBS | sed -e "s/-lpthread//"`
 	dnl minor cleanup
 	XTRA_LIBS=`echo $XTRA_LIBS | sed -e "s/  */ /g"`
 	LIBS=''
Index: squid/auth_modules/PAM/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/PAM/Attic/Makefile.in,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2
--- squid/auth_modules/PAM/Makefile.in	1 Jul 2000 12:20:14 -0000	1.1.1.1.6.1
+++ squid/auth_modules/PAM/Makefile.in	19 Aug 2000 14:43:18 -0000	1.1.1.1.6.2
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.1.1.1.6.1 2000/07/01 12:20:14 hno Exp $
+#  $Id: Makefile.in,v 1.1.1.1.6.2 2000/08/19 14:43:18 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -38,7 +38,7 @@
 MALLOCLIB	= @LIB_MALLOC@
 AC_CFLAGS	= @CFLAGS@
 LDFLAGS		= @LDFLAGS@
-XTRA_LIBS	= @XTRA_LIBS@
+XTRA_LIBS	= @XTRA_LIBS@ @DLLIB@
 XTRA_OBJS 	= @XTRA_OBJS@
 MV		= @MV@
 RM		= @RM@
@@ -47,7 +47,7 @@
 
 INCLUDE		= -I. -I../../include -I$(top_srcdir)/include
 CFLAGS 		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
-AUTH_LIBS	= -lpam -ldl $(XTRA_LIBS)
+AUTH_LIBS	= -lpam $(XTRA_LIBS)
 
 LIBPROGS        = $(PAM_AUTH_EXE)
 OBJS	 	= pam_auth.o