From e3576ccd17dacc60421c73ce71ba03ef1c3d3157 Mon Sep 17 00:00:00 2001 From: Andy Date: Sat, 17 Aug 2013 10:24:30 -0500 Subject: [PATCH] Don't check for gnutls-openssl on systems with older gnutls This was causing a false warning on CentOS 6 w/ gnutls 2.8.5. It would otherwise compile and work fine despite the warning. --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 39ae7d7a5..3834cc507 100644 --- a/configure.ac +++ b/configure.ac @@ -277,8 +277,10 @@ fi AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),) AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead])) AC_CHECK_LIB(gnutls,gnutls_fingerprint,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead])) +if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead])) fi +fi AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support)) AC_CHECK_LIB(z,zlibVersion) AC_CHECK_LIB(x264,x264_predict_16x16_init)