[evolution-patches] soup rh9 openssl love

[Dan Winship <danw ximian com>]

OpenSSL in rh9 is linked against krb5 for some reason and requires all
kinds of extra gunk. But there's a .pc file that deals with that for us,
so...

Index: configure.in
===================================================================
RCS file: /cvs/gnome/libsoup/configure.in,v
retrieving revision 1.86
diff -u -r1.86 configure.in
--- configure.in	2 Jun 2003 20:18:55 -0000	1.86
+++ configure.in	24 Jun 2003 14:31:53 -0000
@@ -279,32 +279,37 @@
 	### Check for OpenSSL
 	###
 	if test "x$found_ssl" != "xyes"; then
-		save_CPPFLAGS=$CPPFLAGS
-		CPPFLAGS="$CPPFLAGS $openssl_inc_prefix"
-		AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="")
-		AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h,
+		PKG_CHECK_MODULES(OPENSSL, openssl, enable_openssl=yes, [
+			save_CPPFLAGS=$CPPFLAGS
+			CPPFLAGS="$CPPFLAGS $openssl_inc_prefix"
+			AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="")
+			AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h,
 				 [enable_openssl="yes"],
 				 [enable_openssl="no"; break])
 
-		if test "x$enable_openssl" = xyes; then
-			if test "x$enable_static_ssl" = "xyes"; then
-				OPENSSL_LIBS="$openssl_prefix/libssl.a $openssl_prefix/libcrypto.a"
+			if test "x$enable_openssl" = xyes; then
+				if test "x$enable_static_ssl" = "xyes"; then
+					OPENSSL_LIBS="$openssl_prefix/libssl.a $openssl_prefix/libcrypto.a"
+				else
+					OPENSSL_LIBS="-L$openssl_prefix -lssl -lcrypto $DL_LDFLAGS"
+				fi
+				OPENSSL_CFLAGS=$CPPFLAGS
 			else
-				OPENSSL_LIBS="-L$openssl_prefix -lssl -lcrypto $DL_LDFLAGS"
+				OPENSSL_LIBS=
+				OPENSSL_CFLAGS=
 			fi
-			OPENSSL_CFLAGS=$CPPFLAGS
+			CPPFLAGS=$save_CPPFLAGS
+		])
+
+		if test "x$enable_openssl" = xyes; then
 			AC_DEFINE(HAVE_OPENSSL, 1,
 				  [Defined if you are using OpenSSL for SSL support])
 			found_ssl=yes
 			AM_CONDITIONAL(BUILD_PROXY, true)
-		else
-			OPENSSL_LIBS=
-			OPENSSL_CFLAGS=
 		fi
 
 		AC_SUBST(OPENSSL_CFLAGS)
 		AC_SUBST(OPENSSL_LIBS)
-		CPPFLAGS=$save_CPPFLAGS
 	fi
 
 dnl NSS 	###
Index: libsoup/soup-openssl.c
===================================================================
RCS file: /cvs/gnome/libsoup/libsoup/soup-openssl.c,v
retrieving revision 1.16
diff -u -r1.16 soup-openssl.c
--- libsoup/soup-openssl.c	21 May 2003 05:01:51 -0000	1.16
+++ libsoup/soup-openssl.c	24 Jun 2003 14:31:53 -0000
@@ -12,7 +12,7 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_OPENSSL_SSL_H
+#ifdef HAVE_OPENSSL
 
 #include <unistd.h>
 #include <glib.h>
@@ -515,4 +515,4 @@
 	}
 }
 
-#endif /*HAVE_OPENSSL_SSL_H*/
+#endif /*HAVE_OPENSSL*/
Index: libsoup/soup-ssl-proxy.c
===================================================================
RCS file: /cvs/gnome/libsoup/libsoup/soup-ssl-proxy.c,v
retrieving revision 1.17
diff -u -r1.17 soup-ssl-proxy.c
--- libsoup/soup-ssl-proxy.c	4 Feb 2003 21:00:54 -0000	1.17
+++ libsoup/soup-ssl-proxy.c	24 Jun 2003 14:31:53 -0000
@@ -21,7 +21,7 @@
 #include <libsoup/soup-misc.h>
 #include <libsoup/soup-private.h>
 
-#ifdef HAVE_OPENSSL_SSL_H
+#ifdef HAVE_OPENSSL
 #include "soup-openssl.h"
 #endif
 
@@ -43,7 +43,7 @@
 	case -1:
 	case 0:
 		break;
-#ifdef HAVE_OPENSSL_SSL_H
+#ifdef HAVE_OPENSSL
 	case 1:
 		soup_openssl_set_security_policy (policy);
 		break;
@@ -56,7 +56,7 @@
 {
 	ssl_library = -1;
 
-#ifdef HAVE_OPENSSL_SSL_H
+#ifdef HAVE_OPENSSL
 	if (ssl_library == -1)
 		ssl_library = soup_openssl_init (server_mode) ? 1 : -1;
 #endif
@@ -77,7 +77,7 @@
 	default:
 		soup_ssl_proxy_init ();
 		return soup_ssl_proxy_get_iochannel (sock);
-#ifdef HAVE_OPENSSL_SSL_H
+#ifdef HAVE_OPENSSL
 	case 1:
 		return soup_openssl_get_iochannel (sock);
 #endif