diff options
| author |   Matthias Bolte <matthias.bolte@googlemail.com> | 2011-08-03 18:23:21 +0200 |
|---|---|---|
| committer | Matthias Bolte <matthias.bolte@googlemail.com> | 2011-08-03 19:22:29 +0200 |
| commit | 099d30a825b30224766fd254756166c18fde1dbe (patch) | |
| tree | c933a6ac673243026ea2cbb98524f2478cbe89cd /configure.ac | |
| parent | Release of libvirt-0.9.4 (diff) | |
| download | libvirt-099d30a825b30224766fd254756166c18fde1dbe.tar.gz libvirt-099d30a825b30224766fd254756166c18fde1dbe.tar.bz2 libvirt-099d30a825b30224766fd254756166c18fde1dbe.zip | |
Fix detection of GnuTLS 1.x.y
Detection based on gnutls_session doesn't work because GnuTLS 2.x.y
comes with a compat.h that defines gnutls_session to gnutls_session_t.
Instead detect this based on LIBGNUTLS_VERSION_MAJOR. Move this from
configure/config.h to gnutls_1_0_compat.h and make sure that all users
include gnutls_1_0_compat.h properly.
Also fix header guard in gnutls_1_0_compat.h.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index c8d291b03..fe700b9d9 100644 --- a/configure.ac +++ b/configure.ac @@ -834,20 +834,6 @@ fi AC_SUBST([GNUTLS_CFLAGS]) AC_SUBST([GNUTLS_LIBS]) -dnl Old versions of GnuTLS uses types like 'gnutls_session' instead -dnl of 'gnutls_session_t'. Try to detect this type if defined so -dnl that we can offer backwards compatibility. -old_cflags="$CFLAGS" -old_libs="$LIBS" -CFLAGS="$CFLAGS $GNUTLS_CFLAGS" -LIBS="$LIBS $GNUTLS_LIBS" -AC_CHECK_TYPE([gnutls_session], - AC_DEFINE([GNUTLS_1_0_COMPAT],[], - [enable GnuTLS 1.0 compatibility macros]),, - [#include <gnutls/gnutls.h>]) -CFLAGS="$old_cflags" -LIBS="$old_libs" - dnl Cyrus SASL AC_ARG_WITH([sasl], |