[dovecot-cvs] dovecot configure.in,1.129,1.130
cras at procontrol.fi
cras at procontrol.fi
Mon Jun 23 03:08:50 EEST 2003
Update of /home/cvs/dovecot
In directory danu:/tmp/cvs-serv31166
Modified Files:
configure.in
Log Message:
Check OpenSSL using pkg-config which at least redhat uses nowadays.
Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- configure.in 4 Jun 2003 16:37:56 -0000 1.129
+++ configure.in 22 Jun 2003 23:08:47 -0000 1.130
@@ -729,15 +729,22 @@
fi
if test "$want_openssl" = "yes" -a "$have_ssl" = "no"; then
- AC_CHECK_LIB(ssl, SSL_read, [
- AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [
- AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support)
- SSL_LIBS="-lssl -lcrypto"
- AC_SUBST(SSL_LIBS)
- have_ssl="yes (OpenSSL)"
- have_openssl=yes
- ])
- ],, -lcrypto)
+ if pkg-config --exists openssl; then
+ PKG_CHECK_MODULES(SSL, openssl)
+ CFLAGS="$CFLAGS $SSL_CFLAGS"
+ have_ssl="yes (OpenSSL)"
+ have_openssl=yes
+ else
+ AC_CHECK_LIB(ssl, SSL_read, [
+ AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [
+ AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support)
+ SSL_LIBS="-lssl -lcrypto"
+ AC_SUBST(SSL_LIBS)
+ have_ssl="yes (OpenSSL)"
+ have_openssl=yes
+ ])
+ ],, -lcrypto)
+ fi
fi
if test "$have_ssl" != "no"; then
More information about the dovecot-cvs
mailing list