1 Index: squid/configure.in
2 diff -c squid/configure.in:1.251.2.52 squid/configure.in:1.251.2.53
3 *** squid/configure.in:1.251.2.52 Tue Mar 2 11:58:27 2004
4 --- squid/configure.in Sat Mar 6 08:14:05 2004
9 LIBREGEX='' # libregex.a
11 + dnl Check for pkg-config
12 + AC_PATH_PROG(PKGCONFIG, pkg-config, /usr/bin/false)
14 dnl find out the exe extension for this platform. If it's not empty, use it for CGI's as well.
19 if test -z "$SSLLIB"; then
20 SSLLIB="-lcrypto" # for MD5 routines
22 ! dnl This is a workaround for RedHat 9 brain damage..
23 ! if test -d /usr/kerberos/include && test -z "$SSLLIBDIR" && test -f /usr/include/openssl/kssl.h; then
24 ! echo "OpenSSL depends on Kerberos"
25 ! SSLLIBDIR="/usr/kerberos/lib"
26 ! CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
29 if test -n "$SSLLIBDIR"; then
31 if test -z "$SSLLIB"; then
32 SSLLIB="-lcrypto" # for MD5 routines
34 ! if $PKGCONFIG --exists openssl; then
35 ! SSLLIB="`$PKGCONFIG --libs openssl`"
36 ! CPPFLAGS="`$PKGCONFIG --cflags openssl` $CPPFLAGS"
39 if test -n "$SSLLIBDIR"; then
40 Index: squid/configure
41 diff -c squid/configure:1.248.2.54 squid/configure:1.248.2.55
42 *** squid/configure:1.248.2.54 Tue Mar 2 18:11:26 2004
43 --- squid/configure Sat Mar 6 18:11:26 2004
47 LIBREGEX='' # libregex.a
49 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
50 echo "configure:1515: checking for Cygwin environment" >&5
51 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
54 LIBREGEX='' # libregex.a
56 + # Extract the first word of "pkg-config", so it can be a program name with args.
57 + set dummy pkg-config; ac_word=$2
58 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
59 + echo "configure:1517: checking for $ac_word" >&5
60 + if eval "test \"`echo '$''{'ac_cv_path_PKGCONFIG'+set}'`\" = set"; then
61 + echo $ac_n "(cached) $ac_c" 1>&6
63 + case "$PKGCONFIG" in
65 + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
68 + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a dos path.
71 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
73 + for ac_dir in $ac_dummy; do
74 + test -z "$ac_dir" && ac_dir=.
75 + if test -f $ac_dir/$ac_word; then
76 + ac_cv_path_PKGCONFIG="$ac_dir/$ac_word"
81 + test -z "$ac_cv_path_PKGCONFIG" && ac_cv_path_PKGCONFIG="/usr/bin/false"
85 + PKGCONFIG="$ac_cv_path_PKGCONFIG"
86 + if test -n "$PKGCONFIG"; then
87 + echo "$ac_t""$PKGCONFIG" 1>&6
89 + echo "$ac_t""no" 1>&6
93 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
94 echo "configure:1515: checking for Cygwin environment" >&5
95 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
98 if test -z "$SSLLIB"; then
99 SSLLIB="-lcrypto" # for MD5 routines
101 ! if test -d /usr/kerberos/include && test -z "$SSLLIBDIR" && test -f /usr/include/openssl/kssl.h; then
102 ! echo "OpenSSL depends on Kerberos"
103 ! SSLLIBDIR="/usr/kerberos/lib"
104 ! CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
107 if test -n "$SSLLIBDIR"; then
109 if test -z "$SSLLIB"; then
110 SSLLIB="-lcrypto" # for MD5 routines
112 ! if $PKGCONFIG --exists openssl; then
113 ! SSLLIB="`$PKGCONFIG --libs openssl`"
114 ! CPPFLAGS="`$PKGCONFIG --cflags openssl` $CPPFLAGS"
117 if test -n "$SSLLIBDIR"; then