aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

disable glib2 + ssl

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2900 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-08-27 00:27:43 +00:00 committed by cras
parent fce48d905b
commit 01ef7837bd
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.in
View File

@ -242,11 +242,6 @@ if test "x$enable_ssl" = xyes; then
OPENSSL_LIBS= OPENSSL_LIBS=
OPENSSL_CFLAGS= OPENSSL_CFLAGS=
fi fi
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
LIBS="$LIBS $OPENSSL_LIBS"
CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
else else
enable_openssl="no" enable_openssl="no"
fi fi
@ -447,6 +442,19 @@ fi
LIBS="$LIBS $GLIB_LIBS" 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 **
dnl ** check if we can link dynamic libraries to modules dnl ** check if we can link dynamic libraries to modules
dnl ** also checks if libraries are built to .libs dir 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 IPv6 support . : $want_ipv6"
echo "Building with SSL support .. : ${enable_openssl}" 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
echo "If there was any problems, read the INSTALL file." echo "If there was any problems, read the INSTALL file."