Check pkgconfig for openssl, since 0.9.7 (a) uses it, and (b) depends on

	* configure.in: Check pkgconfig for openssl, since 0.9.7 (a) uses
	it, and (b) depends on lots of new things sometimes (like on RH9).

	* libsoup/soup-openssl.c:
	* libsoup/soup-ssl-proxy.c: Change #ifdef HAVE_OPENSSL_SSL_H to
	just #ifdef HAVE_OPENSSL since the header check doesn't get run in
	the pkgconfig case

diff --git a/ChangeLog b/ChangeLog
index 2a8ac7b..a008935 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-06-24  Dan Winship  <danw@ximian.com>
+
+       * configure.in: Check pkgconfig for openssl, since 0.9.7 (a) uses
+       it, and (b) depends on lots of new things sometimes (like on RH9).
+
+       * libsoup/soup-openssl.c: 
+       * libsoup/soup-ssl-proxy.c: Change #ifdef HAVE_OPENSSL_SSL_H to
+       just #ifdef HAVE_OPENSSL since the header check doesn't get run in
+       the pkgconfig case
+
 2003-06-19  Dan Winship  <danw@ximian.com>
 
        * libsoup/soup-queue.c (soup_queue_read_done_cb): unref the

diff --git a/configure.in b/configure.in
index f78b48b..91cf03b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -279,32 +279,37 @@ if test "x$enable_ssl" = xyes; then
        ### 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        ###

diff --git a/libsoup/soup-openssl.c b/libsoup/soup-openssl.c
index c61b65c..c166f20 100644 (file)
--- a/libsoup/soup-openssl.c
+++ b/libsoup/soup-openssl.c
@@ -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 @@ soup_openssl_set_security_policy (SoupSecurityPolicy policy)
        }
 }
 
-#endif /*HAVE_OPENSSL_SSL_H*/
+#endif /*HAVE_OPENSSL*/

diff --git a/libsoup/soup-ssl-proxy.c b/libsoup/soup-ssl-proxy.c
index 56eab54..71c8b2c 100644 (file)
--- a/libsoup/soup-ssl-proxy.c
+++ b/libsoup/soup-ssl-proxy.c
@@ -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 @@ soup_ssl_proxy_set_security_policy (SoupSecurityPolicy policy)
        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 @@ soup_ssl_proxy_init (void)
 {
        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 @@ soup_ssl_proxy_get_iochannel (GIOChannel *sock)
        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