Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv11718
Modified Files:
configure configure.in CHANGES
Log Message:
fixed SSL compilation on RH9
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.292
retrieving revision 1.293
diff -b -u -2 -r1.292 -r1.293
--- configure 20 Jun 2003 17:40:02 -0000 1.292
+++ configure 23 Jun 2003 18:42:14 -0000 1.293
@@ -567,5 +567,5 @@
-# From configure.in Id: configure.in,v 1.276 2003/06/20 17:18:01 vadz Exp
+# From configure.in Id: configure.in,v 1.277 2003/06/20 17:40:03 vadz Exp
rm -f conftestdata
@@ -1478,32 +1478,54 @@
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1482: checking for POSIXized ISC" >&5
[...1342 lines suppressed...]
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5260: checking for $ac_word" >&5
+echo "configure:5231: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5342,5 +5313,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5345: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5316: 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
@@ -5365,5 +5336,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5368: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5339: 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.277
retrieving revision 1.278
diff -b -u -2 -r1.277 -r1.278
--- configure.in 20 Jun 2003 17:40:03 -0000 1.277
+++ configure.in 23 Jun 2003 18:42:18 -0000 1.278
@@ -634,9 +634,12 @@
AC_DEFINE(USE_SSL)
- dnl We assume no IDEA/no DSA as this is easiest to compile. It doesn't
- dnl matter anyway as we load openssl later, but we must be able to
- dnl compile the header file (note that we can't give -DNO_RSA any longer
- dnl (starting with imap2000) or auth_ssl.cpp wouldn't compile!)
- IMAP_CPPFLAGS="-DNO_IDEA -DNO_DSA"
+ dnl RH9 install of OpenSSL is broken and krb5.h file included by ssl.h is
+ dnl in a non standard directory and this breaks compilation -- luckily we
+ dnl don't need it anyhow so we can just disable using Kerberos completely
+ dnl
+ dnl the others don't seem to exist any more in the new OpenSSL versions
+ dnl anyhow but we keep them here as apparently they were needed for the
+ dnl older versions, for whatever reasons...
+ SSL_CPPFLAGS="-DNO_IDEA -DNO_DSA -DOPENSSL_NO_KRB5"
dnl have to give the location of SSL headers to cclient if it is in a
@@ -646,13 +649,12 @@
case "$ssl_inc" in
/usr/include)
- IMAP_CPPFLAGS="-I/usr/include/openssl $IMAP_CPPFLAGS"
+ dnl no need to -I/usr/include to the compiler options
;;
*)
- IMAP_CPPFLAGS="-I$ssl_inc -I$ssl_inc/openssl $IMAP_CPPFLAGS"
+ SSL_CPPFLAGS="-I$ssl_inc $SSL_CPPFLAGS"
esac
- dnl note that we don't have to link with SSL libraries because we load
- dnl them dynamically, we just need the headers
- CPPFLAGS="-I$ssl_inc $CPPFLAGS"
+ IMAP_CPPFLAGS="-I$ssl_inc/openssl $SSL_CPPFLAGS $IMAP_CPPFLAGS"
+ CPPFLAGS="$SSL_CPPFLAGS $CPPFLAGS"
else
dnl tell c-client that we don't want to use SSL
Index: CHANGES
===================================================================
RCS file: /cvsroot/mahogany/M/CHANGES,v
retrieving revision 1.313
retrieving revision 1.314
diff -b -u -2 -r1.313 -r1.314
--- CHANGES 23 Jun 2003 01:23:45 -0000 1.313
+++ CHANGES 23 Jun 2003 18:42:18 -0000 1.314
@@ -10,4 +10,5 @@
-------------------------------
+23.06.03 VZ: fixed SSL compilation on RedHat 9
23.06.03 NB: Mahogany can now be compiled with cygwin
11.04.03 VZ: debugged the "Migrate" tool which is now half-usable
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
