ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 426 - Changed to use gnutls instead of openssl 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2266 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2007-12-23 16:37:39 +00:00
parent 30c1a60294
commit eff686eb93
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -182,14 +182,14 @@ AC_CHECK_HEADERS(pcre/pcre.h,,,)
AC_CHECK_HEADERS(pcre.h,,,)
AC_CHECK_DECLS(round,,,[#include <math.h>])
AC_CHECK_DECLS(strsignal,,,[#include <string.h>])
AC_CHECK_DECLS(MD5,,AC_MSG_ERROR(zm requires openssl/md5.h),[#include <stdlib.h>
#include <openssl/md5.h>])
AC_CHECK_DECLS(MD5,,AC_MSG_ERROR(zm requires gnutls/openssl.h),[#include <stdlib.h>
#include <gnutls/openssl.h>])
AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
AC_CHECK_LIB(jpeg,jpeg_start_compress,,AC_MSG_ERROR(zm requires libjpeg.a))
AC_CHECK_LIB(z,compress,,AC_MSG_ERROR(zm requires libz.a))
AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
AC_CHECK_LIB(mysqlclient,mysql_init,,AC_MSG_ERROR(zm requires libmysqlclient.a))
AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN(libcrypto.a is required for authenticated streaming))
AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN(gnutls-openssl.a is required for authenticated streaming))
AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
AC_CHECK_LIB(avutil,ff_gcd,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))

2
src/zm_user.h
View File

@ -24,7 +24,7 @@
#define ZM_USER_H
#if HAVE_LIBCRYPTO
#include <openssl/md5.h>
#include <gnutls/openssl.h>
#endif // HAVE_LIBCRYPTO
class User