aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-01-03 14:56:47 -05:00
Code

More accurate reporting of enabled/disabled features.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4566 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2007-06-17 22:13:24 +00:00 committed by exg
parent 9e57a69b4c
commit 5a433f4359
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure.in
View File

@ -336,21 +336,22 @@ fi
LIBS="$LIBS $GLIB_LIBS" LIBS="$LIBS $GLIB_LIBS"
have_openssl=no
if test "$enable_ssl" = "yes"; then if test "$enable_ssl" = "yes"; then
if pkg-config --exists openssl; then if pkg-config --exists openssl; then
PKG_CHECK_MODULES(SSL, openssl) PKG_CHECK_MODULES(SSL, openssl)
CFLAGS="$CFLAGS $SSL_CFLAGS" CFLAGS="$CFLAGS $SSL_CFLAGS"
enable_openssl=yes have_openssl=yes
else else
AC_CHECK_LIB(ssl, SSL_read, [ AC_CHECK_LIB(ssl, SSL_read, [
AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [ AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [
SSL_LIBS="-lssl -lcrypto" SSL_LIBS="-lssl -lcrypto"
AC_SUBST(SSL_LIBS) AC_SUBST(SSL_LIBS)
enable_openssl=yes have_openssl=yes
]) ])
],, -lcrypto) ],, -lcrypto)
fi fi
if test "$enable_openssl" = "yes"; then if test "$have_openssl" = "yes"; then
AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support) AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support)
LIBS="$LIBS $SSL_LIBS" LIBS="$LIBS $SSL_LIBS"
fi fi
@ -359,23 +360,22 @@ fi
dnl ** dnl **
dnl ** Garbage Collector dnl ** Garbage Collector
dnl ** dnl **
have_gc=no
if test "x$want_gc" = xyes; then if test "x$want_gc" = xyes; then
AC_CHECK_LIB(gc, GC_malloc, [ AC_CHECK_LIB(gc, GC_malloc, [
AC_CHECK_HEADER(gc/gc.h, [ AC_CHECK_HEADER(gc/gc.h, [
AC_DEFINE(HAVE_GC_GC_H) AC_DEFINE(HAVE_GC_GC_H)
AC_DEFINE(USE_GC) AC_DEFINE(USE_GC)
LIBS="$LIBS -lgc" LIBS="$LIBS -lgc"
have_gc=yes
], [ ], [
AC_CHECK_HEADER(gc.h, [ AC_CHECK_HEADER(gc.h, [
AC_DEFINE(HAVE_GC_H) AC_DEFINE(HAVE_GC_H)
AC_DEFINE(USE_GC) AC_DEFINE(USE_GC)
LIBS="$LIBS -lgc" LIBS="$LIBS -lgc"
], [ have_gc=yes
want_gc=no
]) ])
]) ])
], [
want_gc=no
]) ])
fi fi
@ -747,6 +747,7 @@ dnl **
dnl ** IPv6 support dnl ** IPv6 support
dnl ** dnl **
have_ipv6=no
if test "x$want_ipv6" = "xyes"; then if test "x$want_ipv6" = "xyes"; then
AC_MSG_CHECKING([for IPv6]) AC_MSG_CHECKING([for IPv6])
AC_CACHE_VAL(irssi_cv_type_in6_addr, AC_CACHE_VAL(irssi_cv_type_in6_addr,
@ -757,13 +758,12 @@ if test "x$want_ipv6" = "xyes"; then
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h>], #include <arpa/inet.h>],
[struct in6_addr i;], [struct in6_addr i;],
irssi_cv_type_in6_addr=yes, have_ipv6=yes,
irssi_cv_type_in6_addr=no,
)]) )])
if test $irssi_cv_type_in6_addr = yes; then if test $have_ipv6 = yes; then
AC_DEFINE(HAVE_IPV6) AC_DEFINE(HAVE_IPV6)
fi fi
AC_MSG_RESULT($irssi_cv_type_in6_addr) AC_MSG_RESULT($have_ipv6)
fi fi
dnl ** dnl **
@ -891,10 +891,10 @@ echo "Install prefix ................... : $prefix"
echo echo
echo "Building with IPv6 support ....... : $want_ipv6" echo "Building with IPv6 support ....... : $have_ipv6"
echo "Building with SSL support ........ : ${enable_openssl}" echo "Building with SSL support ........ : $have_openssl"
echo "Building with 64bit DCC support .. : $offt_64bit" echo "Building with 64bit DCC support .. : $offt_64bit"
echo "Building with garbage collector .. : $want_gc" echo "Building with garbage collector .. : $have_gc"
echo echo
echo "If there are any problems, read the INSTALL file." echo "If there are any problems, read the INSTALL file."