aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-06-23 06:35:36 +00:00
Code

SSL detection changed to use pkg-config, fixed Redhat 9. Removed

Browse Source 
--with-ssl-include etc. options, you can just CPPFLAGS/LIBS just fine for
that.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3166 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2003-11-17 00:29:11 +00:00 committed by cras
parent 8e29932db3
commit 5972260d88
2 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL
View File

@ -28,7 +28,11 @@ commonly used ones:
this with /SERVER -4 or -6 options. this with /SERVER -4 or -6 options.
If GLib or ncurses is installed installed in a non-standard path you can If GLib or ncurses is installed installed in a non-standard path you can
specify it with --with-glib=/path and --with-ncurses=/path. specify it with --with-glib=/path and --with-ncurses=/path. If anything else
is in non-standard path, you can just give the paths in CPPFLAGS and LIBS
environment variable, eg.:
CPPFLAGS=-I/opt/openssl/include LDFLAGS=-L/opt/openssl/lib ./configure
Irssi doesn't really need curses anymore, by default it uses Irssi doesn't really need curses anymore, by default it uses
terminfo/termcap directly. The functions for using terminfo/termcap terminfo/termcap directly. The functions for using terminfo/termcap

54
configure.in
View File

@ -223,15 +223,6 @@ AC_ARG_ENABLE(ssl,
[ --disable-ssl Disable Secure Sockets Layer support],, [ --disable-ssl Disable Secure Sockets Layer support],,
enable_ssl=yes) enable_ssl=yes)
AC_ARG_WITH(openssl-includes,
[ --with-openssl-includes Specify location of OpenSSL header files],
[openssl_inc_prefix=-I$withval])
AC_ARG_WITH(openssl-libs,
[ --with-openssl-libs Specify location of OpenSSL libs],
[openssl_prefix=$withval],
[openssl_prefix=/usr/lib])
dnl ** dnl **
dnl ** just some generic stuff... dnl ** just some generic stuff...
dnl ** dnl **
@ -475,33 +466,24 @@ fi
LIBS="$LIBS $GLIB_LIBS" LIBS="$LIBS $GLIB_LIBS"
if test "x$enable_ssl" = xyes; then if test "$enable_ssl" = "yes"; then
### if pkg-config --exists openssl; then
### Check for OpenSSL PKG_CHECK_MODULES(SSL, openssl)
### CFLAGS="$CFLAGS $SSL_CFLAGS"
save_CFLAGS=$CFLAGS; enable_openssl=yes
CFLAGS="-lcrypto"; else
AC_CHECK_LIB(ssl, SSL_read, [
enable_openssl="no"; AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [
OPENSSL_LDFLAGS=""; SSL_LIBS="-lssl -lcrypto"
AC_CHECK_LIB(ssl, SSL_read, [ AC_SUBST(SSL_LIBS)
AC_CHECK_LIB(crypto, X509_new, [ enable_openssl=yes
AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [ ])
enable_openssl="yes"; ],, -lcrypto)
OPENSSL_LDFLAGS="-lssl -lcrypto" fi
]) if test "$have_openssl" = "yes"; then
]) AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support)
]) enable_openssl="yes"
CFLAGS=$save_CFLAGS fi
if test "x$enable_openssl" = xyes; then
AC_DEFINE(HAVE_OPENSSL)
LIBS="$LIBS -L$openssl_prefix $OPENSSL_LDFLAGS"
CFLAGS="$CFLAGS $openssl_inc_prefix"
fi
else
enable_openssl="no"
fi fi
dnl ** dnl **