Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv21154
Modified Files:
configure configure.in
Log Message:
another attempt to fix SSL compilation on RH9
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.294
retrieving revision 1.295
diff -b -u -2 -r1.294 -r1.295
--- configure 23 Jun 2003 19:15:56 -0000 1.294
+++ configure 23 Jun 2003 19:33:36 -0000 1.295
@@ -49,9 +49,12 @@
--with-ssl=ssldir specify path where OpenSSL is installed"
ac_help="$ac_help
- --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)"
-ac_help="$ac_help
- --with-wx-exec-prefix=PREFIX Exec prefix where wxWindows is installed (optional)"
+ --with-wxdir=PATH Use uninstalled version of wxWindows in PATH"
ac_help="$ac_help
--with-wx-config=CONFIG wx-config script to use (optional)"
+ac_help="$ac_help
+ --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)"
+ac_help="$ac_help
[...1557 lines suppressed...]
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5284: checking for $ac_word" >&5
+echo "configure:5242: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5366,5 +5324,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5369: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5327: 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
@@ -5389,5 +5347,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5392: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5350: 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.279
retrieving revision 1.280
diff -b -u -2 -r1.279 -r1.280
--- configure.in 23 Jun 2003 19:15:58 -0000 1.279
+++ configure.in 23 Jun 2003 19:33:40 -0000 1.280
@@ -566,6 +566,17 @@
dnl existence with -Iprefix/openssl we must *also* have -Iprefix or it
dnl doesn't risk to work.
+ dnl
+ dnl also, RH9 install of OpenSSL is broken and krb5.h file included by
+ dnl ssl.h is in a non standard directory and this breaks compilation.
+ dnl Luckily we don't need it anyhow so we can just disable using
+ dnl Kerberos completely.
+ dnl
+ dnl the others -DNO_XXX don't seem to exist any more in the new
+ dnl OpenSSL versions anyhow but we keep them here as apparently they
+ dnl were needed for the older versions, for whatever reasons...
+ SSL_CPPFLAGS="-DNO_IDEA -DNO_DSA -DOPENSSL_NO_KRB5"
+
CPPFLAGS_OLD=$CPPFLAGS
- CPPFLAGS="${CPPFLAGS} -I${ssl_inc} -I/usr/ssl/include -I/usr/local/ssl/include"
+ CPPFLAGS="${CPPFLAGS} ${SSL_CPPFLAGS} -I${ssl_inc} -I/usr/ssl/include
-I/usr/local/ssl/include"
M_CHECK_MYHEADER(ssl.h,
[ \
@@ -640,13 +651,4 @@
if test "$ssl_option" = "yes"; then
AC_DEFINE(USE_SSL)
-
- 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
-------------------------------------------------------
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
