From 01ef7837bdefe05457699a5781d4e2e833e79a35 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Tue, 27 Aug 2002 00:27:43 +0000
Subject: [PATCH] disable glib2 + ssl

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2900 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 configure.in | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index ebd9289e..0afa4012 100644
--- a/configure.in
+++ b/configure.in
@@ -242,11 +242,6 @@ if test "x$enable_ssl" = xyes; then
 		OPENSSL_LIBS=
 		OPENSSL_CFLAGS=
 	fi
-
-	AC_SUBST(OPENSSL_CFLAGS)
-	AC_SUBST(OPENSSL_LIBS)
-	LIBS="$LIBS $OPENSSL_LIBS"
-	CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
 else
 	enable_openssl="no"
 fi
@@ -447,6 +442,19 @@ fi
 
 LIBS="$LIBS $GLIB_LIBS"
 
+dnl * make sure glib2 + ssl isn't tried to be used, it won't work
+if test "x$enable_openssl" != "xno"; then
+  if test "x`echo $GLIB_LIBS|grep glib-2.0`" != "x"; then
+    ssl_error="GLIB2 and OpenSSL don't work together currently, SSL is disabled"
+    enable_openssl=no
+    OPENSSL_LIBS=
+    OPENSSL_CFLAGS=
+  fi
+
+  LIBS="$LIBS $OPENSSL_LIBS"
+  CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+fi
+
 dnl **
 dnl ** check if we can link dynamic libraries to modules
 dnl ** also checks if libraries are built to .libs dir
@@ -940,6 +948,9 @@ echo
 
 echo "Building with IPv6 support . : $want_ipv6"
 echo "Building with SSL support .. : ${enable_openssl}"
+if test "x$enable_openssl" = "xno" -a "x$ssl_error" != "x"; then
+  echo "  - $ssl_error"
+fi
 
 echo
 echo "If there was any problems, read the INSTALL file."