diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-09-30 06:25:28 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-09-30 06:25:28 +0000 |
| commit | 3e465a6525f9d7dbd763d7ed4c92a3e73f4db4f4 (patch) | |
| tree | b8afa46faa083d22e0fad7701166de0e219db8f1 /configure.ac | |
| parent | c2adf3f87462a92bccb66c60c9329f17694c1b72 (diff) | |
| download | tigervnc-3e465a6525f9d7dbd763d7ed4c92a3e73f4db4f4.tar.gz tigervnc-3e465a6525f9d7dbd763d7ed4c92a3e73f4db4f4.zip | |
Support building with older versions of gnutls; Fix gnutls detection when building statically using build-xorg
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4147 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c411f8a7..4ea07063 100644 --- a/configure.ac +++ b/configure.ac @@ -76,8 +76,12 @@ AC_ARG_ENABLE([gnutls], GNUTLS_LIBS= if test "x$enable_gnutls" = xyes; then AC_CHECK_LIB([gnutls], [gnutls_global_init], - [GNUTLS_LIBS='-lgnutls' - AC_DEFINE([HAVE_GNUTLS], 1, [Is gnutls present? ])]) + [GNUTLS_LIBS='-lgnutls -lgcrypt -lgpg-error' + AC_DEFINE([HAVE_GNUTLS], 1, [Is gnutls present? ])], [], + [-lgcrypt -lgpg-error]) + AC_CHECK_LIB([gnutls], [gnutls_transport_set_global_errno], [], + [AC_DEFINE([HAVE_OLD_GNUTLS], 1, [Does gnutls lack the gnutls_transport_set_global_errno() function? ])], + [-lgcrypt -lgpg-error]) fi AC_SUBST([GNUTLS_LIBS]) AM_CONDITIONAL([HAVE_GNUTLS], [ ! test "x$GNUTLS_LIBS" = x ]) |