From: hno <> Date: Sun, 20 Mar 2005 08:10:38 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE4~826 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30f36b475aed8dbe732d43553409cc18f1322954;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/Makefile.in b/Makefile.in index 8bc375a754..dcd4e52364 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.70 2005/02/08 01:10:47 hno Exp $ +# $Id: Makefile.in,v 1.71 2005/03/20 01:10:38 hno Exp $ # srcdir = @srcdir@ @@ -115,6 +115,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/configure b/configure index 2550c4297b..443786506b 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.370 . +# From configure.in Revision: 1.371 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -467,7 +467,7 @@ ac_includes_default="\ ac_subdirs_all="$ac_subdirs_all lib/libTrie" ac_subdirs_all="$ac_subdirs_all lib/cppunit-1.10.0" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS DISK_LIBS DISK_PROGRAMS DISK_LINKOBJS REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_LIBS AUTH_LINKOBJS AUTH_OBJS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS SAMBASOURCES LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE SQUID_CPPUNIT_LA SQUID_CPPUNIT_INC SQUID_CPPUNIT_DIR SH FALSE TRUE RM MV MKDIR LN PERL AR_R ALLOCA CRYPTLIB EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS DISK_LIBS DISK_PROGRAMS DISK_LINKOBJS REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_LIBS AUTH_LINKOBJS AUTH_OBJS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS SAMBASOURCES LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE SQUID_CPPUNIT_LA SQUID_CPPUNIT_INC SQUID_CPPUNIT_DIR SH FALSE TRUE RM MV MKDIR LN PERL AR_R ALLOCA CRYPTLIB LIB_LDAP LIB_LBER EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -33199,6 +33199,80 @@ fi ;; esac +case "$host_os" in +mingw|mingw32) + LIB_LDAP="-lwldap32" + LIB_LBER="" + ;; +*) + LIB_LDAP="-lldap" + echo "$as_me:$LINENO: checking for main in -llber" >&5 +echo $ECHO_N "checking for main in -llber... $ECHO_C" >&6 +if test "${ac_cv_lib_lber_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llber $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_lber_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_lber_main=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_lber_main" >&5 +echo "${ECHO_T}$ac_cv_lib_lber_main" >&6 +if test $ac_cv_lib_lber_main = yes; then + LIB_LBER="-llber" +fi + + ;; +esac + + + case "$host" in i386-*-solaris2.*) if test "$GCC" = "yes"; then @@ -36079,6 +36153,8 @@ s,@PERL@,$PERL,;t t s,@AR_R@,$AR_R,;t t s,@ALLOCA@,$ALLOCA,;t t s,@CRYPTLIB@,$CRYPTLIB,;t t +s,@LIB_LDAP@,$LIB_LDAP,;t t +s,@LIB_LBER@,$LIB_LBER,;t t s,@EPOLL_LIBS@,$EPOLL_LIBS,;t t s,@NEED_OWN_SNPRINTF_TRUE@,$NEED_OWN_SNPRINTF_TRUE,;t t s,@NEED_OWN_SNPRINTF_FALSE@,$NEED_OWN_SNPRINTF_FALSE,;t t diff --git a/contrib/Makefile.in b/contrib/Makefile.in index bb600c3721..25619528d7 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -116,6 +116,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 703be55a0e..e4c74d3080 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.43 2005/02/08 01:10:48 hno Exp $ +# $Id: Makefile.in,v 1.44 2005/03/20 01:10:38 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/errors/Makefile.in b/errors/Makefile.in index d2b3af620e..b18ba68e1d 100644 --- a/errors/Makefile.in +++ b/errors/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.60 2005/02/08 01:10:49 hno Exp $ +# $Id: Makefile.in,v 1.61 2005/03/20 01:10:39 hno Exp $ # srcdir = @srcdir@ @@ -115,6 +115,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/Makefile.in b/helpers/Makefile.in index 1417d5519e..97f5a93254 100644 --- a/helpers/Makefile.in +++ b/helpers/Makefile.in @@ -111,6 +111,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in index 02b481172e..936ccc2006 100644 --- a/helpers/basic_auth/LDAP/Makefile.in +++ b/helpers/basic_auth/LDAP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.52 2005/02/08 01:10:49 hno Exp $ +# $Id: Makefile.in,v 1.53 2005/03/20 01:10:40 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ @@ -227,7 +229,7 @@ man_MANS = squid_ldap_auth.8 EXTRA_DIST = squid_ldap_auth.8 squid_ldap_auth_SOURCES = squid_ldap_auth.c -LDADD = -L$(top_builddir)/lib -lmiscutil -lldap -llber $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(XTRA_LIBS) INCLUDES = -I$(top_srcdir)/include subdir = helpers/basic_auth/LDAP ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in index 7814407de4..8c61695709 100644 --- a/helpers/basic_auth/MSNT/Makefile.in +++ b/helpers/basic_auth/MSNT/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.55 2005/02/08 01:10:50 hno Exp $ +# $Id: Makefile.in,v 1.56 2005/03/20 01:10:41 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in index 150a9f296f..eb377b3212 100644 --- a/helpers/basic_auth/Makefile.in +++ b/helpers/basic_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.50 2005/02/08 01:10:49 hno Exp $ +# $Id: Makefile.in,v 1.51 2005/03/20 01:10:40 hno Exp $ # srcdir = @srcdir@ @@ -116,6 +116,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in index e334f5ed19..8566b9c7a1 100644 --- a/helpers/basic_auth/NCSA/Makefile.in +++ b/helpers/basic_auth/NCSA/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.52 2005/02/08 01:10:54 hno Exp $ +# $Id: Makefile.in,v 1.53 2005/03/20 01:10:42 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in index 9048fee297..7207a382d5 100644 --- a/helpers/basic_auth/PAM/Makefile.in +++ b/helpers/basic_auth/PAM/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid PAM authentication helper # -# $Id: Makefile.in,v 1.53 2005/02/08 01:10:54 hno Exp $ +# $Id: Makefile.in,v 1.54 2005/03/20 01:10:42 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in index 8ff46c12c5..f2562fbe04 100644 --- a/helpers/basic_auth/SASL/Makefile.in +++ b/helpers/basic_auth/SASL/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid SASL authentication helper # -# $Id: Makefile.in,v 1.49 2005/02/08 01:10:54 hno Exp $ +# $Id: Makefile.in,v 1.50 2005/03/20 01:10:42 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in index 7d92bae513..e64bc0dffc 100644 --- a/helpers/basic_auth/SMB/Makefile.in +++ b/helpers/basic_auth/SMB/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.51 2005/02/08 01:10:54 hno Exp $ +# $Id: Makefile.in,v 1.52 2005/03/20 01:10:43 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -124,6 +124,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in index 858d58b3d5..926363959b 100644 --- a/helpers/basic_auth/YP/Makefile.in +++ b/helpers/basic_auth/YP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.52 2005/02/08 01:10:55 hno Exp $ +# $Id: Makefile.in,v 1.53 2005/03/20 01:10:43 hno Exp $ # # @@ -118,6 +118,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in index b38606122f..30e6c79e20 100644 --- a/helpers/basic_auth/getpwnam/Makefile.in +++ b/helpers/basic_auth/getpwnam/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.50 2005/02/08 01:10:55 hno Exp $ +# $Id: Makefile.in,v 1.51 2005/03/20 01:10:43 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in index 1dfa291d7d..237905fd13 100644 --- a/helpers/basic_auth/multi-domain-NTLM/Makefile.in +++ b/helpers/basic_auth/multi-domain-NTLM/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.48 2005/02/08 01:10:55 hno Exp $ +# $Id: Makefile.in,v 1.49 2005/03/20 01:10:44 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/basic_auth/winbind/Makefile.in b/helpers/basic_auth/winbind/Makefile.in index 2fa8471fdf..45c4337811 100644 --- a/helpers/basic_auth/winbind/Makefile.in +++ b/helpers/basic_auth/winbind/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.42 2005/02/08 01:10:57 hno Exp $ +# $Id: Makefile.in,v 1.43 2005/03/20 01:10:44 hno Exp $ # srcdir = @srcdir@ @@ -117,6 +117,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in index c730d219f6..9eac7481f2 100644 --- a/helpers/digest_auth/Makefile.in +++ b/helpers/digest_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.47 2005/02/08 01:10:57 hno Exp $ +# $Id: Makefile.in,v 1.48 2005/03/20 01:10:44 hno Exp $ # srcdir = @srcdir@ @@ -116,6 +116,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in index 7ad4775038..df45417f78 100644 --- a/helpers/digest_auth/password/Makefile.in +++ b/helpers/digest_auth/password/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.50 2005/02/08 01:10:57 hno Exp $ +# $Id: Makefile.in,v 1.51 2005/03/20 01:10:45 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/external_acl/Makefile.in b/helpers/external_acl/Makefile.in index 8326fc548e..ac73116e80 100644 --- a/helpers/external_acl/Makefile.in +++ b/helpers/external_acl/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.37 2005/02/08 01:10:59 hno Exp $ +# $Id: Makefile.in,v 1.38 2005/03/20 01:10:45 hno Exp $ # srcdir = @srcdir@ @@ -116,6 +116,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/external_acl/ip_user/Makefile.in b/helpers/external_acl/ip_user/Makefile.in index 6130839a54..5c931cbb80 100644 --- a/helpers/external_acl/ip_user/Makefile.in +++ b/helpers/external_acl/ip_user/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.in,v 1.38 2005/02/08 01:10:59 hno Exp $ +# $Id: Makefile.in,v 1.39 2005/03/20 01:10:45 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/external_acl/ldap_group/Makefile.in b/helpers/external_acl/ldap_group/Makefile.in index 10cd2cafa4..584fb9420a 100644 --- a/helpers/external_acl/ldap_group/Makefile.in +++ b/helpers/external_acl/ldap_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.40 2005/02/08 01:10:59 hno Exp $ +# $Id: Makefile.in,v 1.41 2005/03/20 01:10:46 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ @@ -227,7 +229,7 @@ man_MANS = squid_ldap_group.8 EXTRA_DIST = squid_ldap_group.8 squid_ldap_group_SOURCES = squid_ldap_group.c -LDADD = -L$(top_builddir)/lib -lmiscutil -lldap -llber @XTRA_LIBS@ +LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) @XTRA_LIBS@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include subdir = helpers/external_acl/ldap_group ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/helpers/external_acl/unix_group/Makefile.in b/helpers/external_acl/unix_group/Makefile.in index 1d0de888f5..9d2f32c127 100644 --- a/helpers/external_acl/unix_group/Makefile.in +++ b/helpers/external_acl/unix_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.38 2005/02/08 01:10:59 hno Exp $ +# $Id: Makefile.in,v 1.39 2005/03/20 01:10:46 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/external_acl/wbinfo_group/Makefile.in b/helpers/external_acl/wbinfo_group/Makefile.in index dc7f8211a3..7f4efdf55d 100644 --- a/helpers/external_acl/wbinfo_group/Makefile.in +++ b/helpers/external_acl/wbinfo_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.36 2005/02/08 01:11:00 hno Exp $ +# $Id: Makefile.in,v 1.37 2005/03/20 01:10:47 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/external_acl/winbind_group/Makefile.in b/helpers/external_acl/winbind_group/Makefile.in index c95500ad16..b4bcc8c6a8 100644 --- a/helpers/external_acl/winbind_group/Makefile.in +++ b/helpers/external_acl/winbind_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the wb_group external_acl helper # -# $Id: Makefile.in,v 1.39 2005/02/08 01:11:00 hno Exp $ +# $Id: Makefile.in,v 1.40 2005/03/20 01:10:48 hno Exp $ # srcdir = @srcdir@ @@ -117,6 +117,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in index b86f1ac6d1..19e12a0510 100644 --- a/helpers/ntlm_auth/Makefile.in +++ b/helpers/ntlm_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.50 2005/02/08 01:11:04 hno Exp $ +# $Id: Makefile.in,v 1.51 2005/03/20 01:10:48 hno Exp $ # srcdir = @srcdir@ @@ -116,6 +116,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in index dc06727553..df3fc22b82 100644 --- a/helpers/ntlm_auth/SMB/Makefile.in +++ b/helpers/ntlm_auth/SMB/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.50 2005/02/08 01:11:07 hno Exp $ +# $Id: Makefile.in,v 1.51 2005/03/20 01:10:48 hno Exp $ # srcdir = @srcdir@ @@ -117,6 +117,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in index ee533dcd86..da79ed5fb0 100644 --- a/helpers/ntlm_auth/SMB/smbval/Makefile.in +++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in @@ -113,6 +113,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in index 165017ff41..9a7b56e693 100644 --- a/helpers/ntlm_auth/fakeauth/Makefile.in +++ b/helpers/ntlm_auth/fakeauth/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.49 2005/02/08 01:11:08 hno Exp $ +# $Id: Makefile.in,v 1.50 2005/03/20 01:10:49 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in index d009e74213..e90f678e33 100644 --- a/helpers/ntlm_auth/no_check/Makefile.in +++ b/helpers/ntlm_auth/no_check/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.51 2005/02/08 01:11:08 hno Exp $ +# $Id: Makefile.in,v 1.52 2005/03/20 01:10:49 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -119,6 +119,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/helpers/ntlm_auth/winbind/Makefile.in b/helpers/ntlm_auth/winbind/Makefile.in index 17b01436d7..fbd22888ef 100644 --- a/helpers/ntlm_auth/winbind/Makefile.in +++ b/helpers/ntlm_auth/winbind/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.42 2005/02/08 01:11:09 hno Exp $ +# $Id: Makefile.in,v 1.43 2005/03/20 01:10:50 hno Exp $ # srcdir = @srcdir@ @@ -117,6 +117,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/icons/Makefile.in b/icons/Makefile.in index 908da07cec..8bd2352587 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.65 2005/02/08 01:11:09 hno Exp $ +# $Id: Makefile.in,v 1.66 2005/03/20 01:10:51 hno Exp $ # srcdir = @srcdir@ @@ -114,6 +114,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 0a0b9c1758..496e3fab67 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.102 2005/02/08 01:11:09 hno Exp $ +# $Id: Makefile.in,v 1.103 2005/03/20 01:10:51 hno Exp $ # srcdir = @srcdir@ @@ -115,6 +115,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index bb6f292452..064168b322 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -116,6 +116,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in index e4447ad9f2..d5cdde3a37 100644 --- a/snmplib/Makefile.in +++ b/snmplib/Makefile.in @@ -111,6 +111,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/src/Makefile.in b/src/Makefile.in index 2de917483d..425ecc2751 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.338 2005/02/08 01:11:10 hno Exp $ +# $Id: Makefile.in,v 1.339 2005/03/20 01:10:53 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -120,6 +120,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 94debd21f9..2f19e77726 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -111,6 +111,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ @@ -216,7 +218,7 @@ target_alias = @target_alias@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.49 2005/02/08 01:11:11 hno Exp $ +# $Id: Makefile.in,v 1.50 2005/03/20 01:10:53 hno Exp $ # AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = @SQUID_CFLAGS@ diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index a7bbbe1e0d..31232b88a9 100644 --- a/src/fs/Makefile.in +++ b/src/fs/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.55 2005/02/08 01:11:11 hno Exp $ +# $Id: Makefile.in,v 1.56 2005/03/20 01:10:53 hno Exp $ # srcdir = @srcdir@ @@ -116,6 +116,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in index 3a8dadf68d..86db9797c4 100644 --- a/src/repl/Makefile.in +++ b/src/repl/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.49 2005/02/08 01:11:11 hno Exp $ +# $Id: Makefile.in,v 1.50 2005/03/20 01:10:53 hno Exp $ # srcdir = @srcdir@ @@ -116,6 +116,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@ diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in index 9b24aac4e8..51ddf8668a 100644 --- a/test-suite/Makefile.in +++ b/test-suite/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.46 2005/02/08 01:11:12 hno Exp $ +# $Id: Makefile.in,v 1.47 2005/03/20 01:10:54 hno Exp $ # srcdir = @srcdir@ @@ -117,6 +117,8 @@ LIBREGEX = @LIBREGEX@ LIBS = @LIBS@ LIBSASL = @LIBSASL@ LIBTOOL = @LIBTOOL@ +LIB_LBER = @LIB_LBER@ +LIB_LDAP = @LIB_LDAP@ LIB_MALLOC = @LIB_MALLOC@ LN = @LN@ LN_S = @LN_S@