Update of /cvsroot/mahogany/M
In directory usw-pr-cvs1:/tmp/cvs-serv23914
Modified Files:
configure configure.in
Log Message:
fixed SSL headers swithces for c-client detection logic when they were in a standard
location
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.278
retrieving revision 1.279
diff -b -u -2 -r1.278 -r1.279
--- configure 16 Jul 2002 00:24:39 -0000 1.278
+++ configure 13 Aug 2002 11:01:28 -0000 1.279
@@ -564,5 +564,5 @@
-# From configure.in Id: configure.in,v 1.263 2002/07/03 00:43:20 vadz Exp
+# From configure.in Id: configure.in,v 1.264 2002/07/16 00:24:39 vadz Exp
rm -f conftestdata
@@ -2856,7 +2856,7 @@
esac
- m_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6
-echo "configure:2861: checking for openssl/ssl.h" >&5
+ m_safe=`echo "ssl.h"
+| sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for ssl.h""... $ac_c" 1>&6
+echo "configure:2861: checking for ssl.h" >&5
if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2864,11 +2864,11 @@
m_save_CPPFLAGS="$CPPFLAGS"
for j in "." \
- $ssl_inc \
- /include \
- /usr/ssl/include \
- /usr/local/include \
- /usr/local/ssl/include \
- /home/local/include \
- /home/local/ssl/include \
+ $ssl_inc/openssl \
+ /include/openssl \
+ /usr/ssl/include/openssl \
+ /usr/local/include/openssl \
+ /usr/local/ssl/include/openssl \
+ /home/local/include/openssl \
+ /home/local/ssl/include/openssl \
; do
CPPFLAGS="-I$j $CPPFLAGS"
@@ -2876,5 +2876,5 @@
#line 2877 "configure"
#include "confdefs.h"
- #include <openssl/ssl.h>
+ #include <ssl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -2915,5 +2915,5 @@
ssl_option=yes
- ssl_inc=$m_cv_header_openssl_ssl_h
+ ssl_inc=$m_cv_header_ssl_h
else
@@ -2925,10 +2925,11 @@
if test "$ssl_option" != "no"; then
- ssl_lib=`echo $ssl_inc | sed 's/include$/lib/'`
+ ssl_inc=`echo $ssl_inc | sed 's@/openssl$@@'`
+ ssl_lib=`echo $ssl_inc | sed 's@include$@lib@'`
LIBS_SSL=""
echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
-echo "configure:2933: checking for main in -lcrypto" >&5
+echo "configure:2934: checking for main in -lcrypto" >&5
m_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'m_cv_lib_$m_lib_var'+set}'`\" = set"; then
@@ -2944,5 +2945,5 @@
LIBS="-L$j -lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2947 "configure"
+#line 2948 "configure"
#include "confdefs.h"
@@ -2951,5 +2952,5 @@
; return 0; }
EOF
-if { (eval echo configure:2954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:2955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "m_cv_lib_$m_lib_var=\"libpath_$m_lib_var=-L$j\""
@@ -2983,5 +2984,5 @@
echo $ac_n "checking for main in -lssl""... $ac_c" 1>&6
-echo "configure:2986: checking for main in -lssl" >&5
+echo "configure:2987: checking for main in -lssl" >&5
m_lib_var=`echo ssl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'m_cv_lib_$m_lib_var'+set}'`\" = set"; then
@@ -2998,5 +2999,5 @@
$LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3001 "configure"
+#line 3002 "configure"
#include "confdefs.h"
@@ -3005,5 +3006,5 @@
; return 0; }
EOF
-if { (eval echo configure:3008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "m_cv_lib_$m_lib_var=\"libpath_$m_lib_var=-L$j\""
@@ -3039,10 +3040,10 @@
if test "$ssl_option" != "no"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:3042: checking for socket" >&5
+echo "configure:3043: checking for socket" >&5
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3047 "configure"
+#line 3048 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -3070,5 +3071,5 @@
; return 0; }
EOF
-if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
@@ -3088,5 +3089,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3091: checking for socket in -lsocket" >&5
+echo "configure:3092: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3096,5 +3097,5 @@
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3099 "configure"
+#line 3100 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3110,5 +3111,5 @@
; return 0; }
EOF
-if { (eval echo configure:3113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3141,10 +3142,10 @@
echo $ac_n "checking for gethostname""... $ac_c" 1>&6
-echo "configure:3144: checking for gethostname" >&5
+echo "configure:3145: checking for gethostname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3149 "configure"
+#line 3150 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -3172,5 +3173,5 @@
; return 0; }
EOF
-if { (eval echo configure:3175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostname=yes"
@@ -3190,5 +3191,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostname in -lresolv""... $ac_c" 1>&6
-echo "configure:3193: checking for gethostname in -lresolv" >&5
+echo "configure:3194: checking for gethostname in -lresolv" >&5
ac_lib_var=`echo resolv'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3198,5 +3199,5 @@
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3201 "configure"
+#line 3202 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3212,5 +3213,5 @@
; return 0; }
EOF
-if { (eval echo configure:3215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3243,10 +3244,10 @@
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3246: checking for gethostbyname" >&5
+echo "configure:3247: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3251 "configure"
+#line 3252 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -3274,5 +3275,5 @@
; return 0; }
EOF
-if { (eval echo configure:3277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
@@ -3292,5 +3293,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3295: checking for gethostbyname in -lnsl" >&5
+echo "configure:3296: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3300,5 +3301,5 @@
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3303 "configure"
+#line 3304 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3314,5 +3315,5 @@
; return 0; }
EOF
-if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3384,5 +3385,5 @@
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:3387: checking for main in -ldl" >&5
+echo "configure:3388: checking for main in -ldl" >&5
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3392,5 +3393,5 @@
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3395 "configure"
+#line 3396 "configure"
#include "confdefs.h"
@@ -3399,5 +3400,5 @@
; return 0; }
EOF
-if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3428,10 +3429,10 @@
echo $ac_n "checking for crypt""... $ac_c" 1>&6
-echo "configure:3431: checking for crypt" >&5
+echo "configure:3432: checking for crypt" >&5
if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3436 "configure"
+#line 3437 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -3459,5 +3460,5 @@
; return 0; }
EOF
-if { (eval echo configure:3462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_crypt=yes"
@@ -3477,5 +3478,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3480: checking for crypt in -lcrypt" >&5
+echo "configure:3481: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3485,5 +3486,5 @@
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3488 "configure"
+#line 3489 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3499,5 +3500,5 @@
; return 0; }
EOF
-if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3536,5 +3537,5 @@
echo $ac_n "checking for main in -lshadow""... $ac_c" 1>&6
-echo "configure:3539: checking for main in -lshadow" >&5
+echo "configure:3540: checking for main in -lshadow" >&5
ac_lib_var=`echo shadow'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3544,5 +3545,5 @@
LIBS="-lshadow $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3547 "configure"
+#line 3548 "configure"
#include "confdefs.h"
@@ -3551,5 +3552,5 @@
; return 0; }
EOF
-if { (eval echo configure:3554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3581,10 +3582,10 @@
USE_RBL=1
echo $ac_n "checking for res_query""... $ac_c" 1>&6
-echo "configure:3584: checking for res_query" >&5
+echo "configure:3585: checking for res_query" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_query'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3589 "configure"
+#line 3590 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -3612,5 +3613,5 @@
; return 0; }
EOF
-if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_query=yes"
@@ -3630,5 +3631,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for res_query in -lresolv""... $ac_c" 1>&6
-echo "configure:3633: checking for res_query in -lresolv" >&5
+echo "configure:3634: checking for res_query in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3638,5 +3639,5 @@
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3641 "configure"
+#line 3642 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3652,5 +3653,5 @@
; return 0; }
EOF
-if { (eval echo configure:3655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3678,5 +3679,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for res_query in -lbind""... $ac_c" 1>&6
-echo "configure:3681: checking for res_query in -lbind" >&5
+echo "configure:3682: checking for res_query in -lbind" >&5
ac_lib_var=`echo bind'_'res_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3686,5 +3687,5 @@
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3689 "configure"
+#line 3690 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3700,5 +3701,5 @@
; return 0; }
EOF
-if { (eval echo configure:3703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3740,15 +3741,15 @@
ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:3743: checking for regex.h" >&5
+echo "configure:3744: checking for regex.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3748 "configure"
+#line 3749 "configure"
#include "confdefs.h"
#include <regex.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
@@ -3767,10 +3768,10 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:3770: checking for regcomp" >&5
+echo "configure:3771: checking for regcomp" >&5
if eval "test \"`echo '$''{'ac_cv_func_regcomp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3775 "configure"
+#line 3776 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -3798,5 +3799,5 @@
; return 0; }
EOF
-if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_regcomp=yes"
@@ -3816,5 +3817,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
-echo "configure:3819: checking for regcomp in -lregex" >&5
+echo "configure:3820: checking for regcomp in -lregex" >&5
ac_lib_var=`echo regex'_'regcomp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3824,5 +3825,5 @@
LIBS="-lregex $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3827 "configure"
+#line 3828 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3838,5 +3839,5 @@
; return 0; }
EOF
-if { (eval echo configure:3841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3876,5 +3877,5 @@
m_safe=`echo "Python.h_2.1" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Python.h (2.1)""... $ac_c" 1>&6
-echo "configure:3879: checking for Python.h (2.1)" >&5
+echo "configure:3880: checking for Python.h (2.1)" >&5
if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3888,10 +3889,10 @@
CPPFLAGS="-I$j $CPPFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 3891 "configure"
+#line 3892 "configure"
#include "confdefs.h"
#include <Python.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
@@ -3932,5 +3933,5 @@
m_safe=`echo "Python.h_2.0" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Python.h (2.0)""... $ac_c" 1>&6
-echo "configure:3935: checking for Python.h (2.0)" >&5
+echo "configure:3936: checking for Python.h (2.0)" >&5
if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3944,10 +3945,10 @@
CPPFLAGS="-I$j $CPPFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 3947 "configure"
+#line 3948 "configure"
#include "confdefs.h"
#include <Python.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
@@ -3988,5 +3989,5 @@
m_safe=`echo "Python.h_1.5" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Python.h (1.5)""... $ac_c" 1>&6
-echo "configure:3991: checking for Python.h (1.5)" >&5
+echo "configure:3992: checking for Python.h (1.5)" >&5
if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4000,10 +4001,10 @@
CPPFLAGS="-I$j $CPPFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 4003 "configure"
+#line 4004 "configure"
#include "confdefs.h"
#include <Python.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
@@ -4072,5 +4073,5 @@
static|Static|STATIC|1)
echo $ac_n "checking for main in -lpython$PYTHON_VER""... $ac_c" 1>&6
-echo "configure:4075: checking for main in -lpython$PYTHON_VER" >&5
+echo "configure:4076: checking for main in -lpython$PYTHON_VER" >&5
m_lib_var=`echo python$PYTHON_VER'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'m_cv_lib_$m_lib_var'+set}'`\" = set"; then
@@ -4091,5 +4092,5 @@
LIBS="-L$j -lpython$PYTHON_VER $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4094 "configure"
+#line 4095 "configure"
#include "confdefs.h"
@@ -4098,5 +4099,5 @@
; return 0; }
EOF
-if { (eval echo configure:4101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "m_cv_lib_$m_lib_var=\"libpath_$m_lib_var=-L$j\""
@@ -4140,10 +4141,10 @@
if test "$PYTHON_VER" != "1.5"; then
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:4143: checking for openpty" >&5
+echo "configure:4144: checking for openpty" >&5
if eval "test \"`echo '$''{'ac_cv_func_openpty'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4148 "configure"
+#line 4149 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -4171,5 +4172,5 @@
; return 0; }
EOF
-if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_openpty=yes"
@@ -4189,5 +4190,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4192: checking for openpty in -lutil" >&5
+echo "configure:4193: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4197,5 +4198,5 @@
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4200 "configure"
+#line 4201 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4211,5 +4212,5 @@
; return 0; }
EOF
-if { (eval echo configure:4214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4260,5 +4261,5 @@
set dummy swig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4263: checking for $ac_word" >&5
+echo "configure:4264: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SWIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4308,5 +4309,5 @@
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4311: checking for $ac_word" >&5
+echo "configure:4312: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4343,5 +4344,5 @@
set dummy msgmerge; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4346: checking for $ac_word" >&5
+echo "configure:4347: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4386,5 +4387,5 @@
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4389: checking for $ac_word" >&5
+echo "configure:4390: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4445,5 +4446,5 @@
if test -x "$WX_CONFIG_NAME" ; then
echo $ac_n "checking for wx-config""... $ac_c" 1>&6
-echo "configure:4448: checking for wx-config" >&5
+echo "configure:4449: checking for wx-config" >&5
WX_CONFIG_PATH="$WX_CONFIG_NAME"
echo "$ac_t""$WX_CONFIG_PATH" 1>&6
@@ -4452,5 +4453,5 @@
set dummy $WX_CONFIG_NAME; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4455: checking for $ac_word" >&5
+echo "configure:4456: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_WX_CONFIG_PATH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4493,5 +4494,5 @@
min_wx_version=2.3.2
echo $ac_n "checking for wxWindows version >= $min_wx_version""... $ac_c" 1>&6
-echo "configure:4496: checking for wxWindows version >= $min_wx_version" >&5
+echo "configure:4497: checking for wxWindows version >= $min_wx_version" >&5
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args"
@@ -4631,5 +4632,5 @@
case "$USE_THREADS" in 1)
echo $ac_n "checking if wxWindows was compiled with threads""... $ac_c" 1>&6
-echo "configure:4634: checking if wxWindows was compiled with threads" >&5
+echo "configure:4635: checking if wxWindows was compiled with threads" >&5
if eval "test \"`echo '$''{'m_cv_wx_threads'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4639,5 +4640,5 @@
else
cat > conftest.$ac_ext <<EOF
-#line 4642 "configure"
+#line 4643 "configure"
#include "confdefs.h"
#ifdef __cplusplus
@@ -4653,5 +4654,5 @@
}
EOF
-if { (eval echo configure:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
m_cv_wx_threads=yes
@@ -4689,5 +4690,5 @@
linux* | Linux*)
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:4692: checking for pam_end in -lpam" >&5
+echo "configure:4693: checking for pam_end in -lpam" >&5
ac_lib_var=`echo pam'_'pam_end | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4697,5 +4698,5 @@
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4700 "configure"
+#line 4701 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4711,5 +4712,5 @@
; return 0; }
EOF
-if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4737,5 +4738,5 @@
case "$USE_CCOSTYPE" in
''|0|1) echo $ac_n "checking for c-client library OS type""... $ac_c" 1>&6
-echo "configure:4740: checking for c-client library OS type" >&5
+echo "configure:4741: checking for c-client library OS type" >&5
case "$OSTYPE" in
linux* | Linux*)
@@ -4787,15 +4788,15 @@
ac_safe=`echo "pi-source.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pi-source.h""... $ac_c" 1>&6
-echo "configure:4790: checking for pi-source.h" >&5
+echo "configure:4791: checking for pi-source.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4795 "configure"
+#line 4796 "configure"
#include "confdefs.h"
#include <pi-source.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
@@ -4814,5 +4815,5 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lpisock""... $ac_c" 1>&6
-echo "configure:4817: checking for main in -lpisock" >&5
+echo "configure:4818: checking for main in -lpisock" >&5
ac_lib_var=`echo pisock'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4822,5 +4823,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4825 "configure"
+#line 4826 "configure"
#include "confdefs.h"
@@ -4829,5 +4830,5 @@
; return 0; }
EOF
-if { (eval echo configure:4832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4850,5 +4851,5 @@
MAKE_PISOCKLIB="PISOCK_LIB:=-lpisock"
echo $ac_n "checking for pi_setmaxspeed in -lpisock""... $ac_c" 1>&6
-echo "configure:4853: checking for pi_setmaxspeed in -lpisock" >&5
+echo "configure:4854: checking for pi_setmaxspeed in -lpisock" >&5
ac_lib_var=`echo pisock'_'pi_setmaxspeed | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4858,5 +4859,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4861 "configure"
+#line 4862 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4872,5 +4873,5 @@
; return 0; }
EOF
-if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4897,5 +4898,5 @@
echo $ac_n "checking for pi_accept_to in -lpisock""... $ac_c" 1>&6
-echo "configure:4900: checking for pi_accept_to in -lpisock" >&5
+echo "configure:4901: checking for pi_accept_to in -lpisock" >&5
ac_lib_var=`echo pisock'_'pi_accept_to | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4905,5 +4906,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4908 "configure"
+#line 4909 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4919,5 +4920,5 @@
; return 0; }
EOF
-if { (eval echo configure:4922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4965,5 +4966,5 @@
*)
echo $ac_n "checking for libmal in extra/src""... $ac_c" 1>&6
-echo "configure:4968: checking for libmal in extra/src" >&5
+echo "configure:4969: checking for libmal in extra/src" >&5
if test ! -d $srcdir/extra/src/libmal
then echo "$ac_t""not found - no MAL synch for PalmOS" 1>&6
@@ -5007,5 +5008,5 @@
auto|Auto|AUTO|1)
echo $ac_n "checking how to link modules""... $ac_c" 1>&6
-echo "configure:5010: checking how to link modules" >&5
+echo "configure:5011: checking how to link modules" >&5
echo "int main() { return 0; }" >conftest.c
if $CXX -o conftest $WX_LIBS conftest.c && \
@@ -5054,5 +5055,5 @@
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5057: checking for $ac_word" >&5
+echo "configure:5058: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5089,5 +5090,5 @@
set dummy latex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5092: checking for $ac_word" >&5
+echo "configure:5093: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5124,5 +5125,5 @@
set dummy makeindex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5127: checking for $ac_word" >&5
+echo "configure:5128: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKEINDEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5159,5 +5160,5 @@
set dummy dvips; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5162: checking for $ac_word" >&5
+echo "configure:5163: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5194,5 +5195,5 @@
set dummy ps2pdf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5197: checking for $ac_word" >&5
+echo "configure:5198: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PSTOPDF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5229,5 +5230,5 @@
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5232: checking for $ac_word" >&5
+echo "configure:5233: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5302,5 +5303,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5305: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5306: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_cxx_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5325,5 +5326,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5328: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5329: checking whether ${CC} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.264
retrieving revision 1.265
diff -b -u -2 -r1.264 -r1.265
--- configure.in 16 Jul 2002 00:24:39 -0000 1.264
+++ configure.in 13 Aug 2002 11:01:31 -0000 1.265
@@ -560,17 +560,24 @@
esac
- M_CHECK_MYHEADER(openssl/ssl.h,
+ dnl there is a subtlety here: we have to look for ssl.h and not for
+ dnl openssl/ssl.h directly because if the latter is in a standard
+ dnl location (e.g. /usr/include) we have no way of knowing which -I
+ dnl option we should use for c-client which wants to directly include
+ dnl <ssl.h> and not <openssl/ssl.h> -- using /usr/include/openssl
+ dnl as we used to do doesn't work in case when the SSL headers live
+ dnl under /usr/local
+ M_CHECK_MYHEADER(ssl.h,
[ \
- $ssl_inc \
- /include \
- /usr/ssl/include \
- /usr/local/include \
- /usr/local/ssl/include \
- /home/local/include \
- /home/local/ssl/include \
+ $ssl_inc/openssl \
+ /include/openssl \
+ /usr/ssl/include/openssl \
+ /usr/local/include/openssl \
+ /usr/local/ssl/include/openssl \
+ /home/local/include/openssl \
+ /home/local/ssl/include/openssl \
],
[
ssl_option=yes
- ssl_inc=$m_cv_header_openssl_ssl_h
+ ssl_inc=$m_cv_header_ssl_h
],
ssl_option=no
@@ -578,5 +585,7 @@
if test "$ssl_option" != "no"; then
- ssl_lib=`echo $ssl_inc | sed 's/include$/lib/'`
+ dnl remove the openssl suffix now
+ ssl_inc=`echo $ssl_inc | sed 's@/openssl$@@'`
+ ssl_lib=`echo $ssl_inc | sed 's@include$@lib@'`
LIBS_SSL=""
-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
