2011/8/3 Eric Blake <eblake@redhat.com>:
On 08/03/2011 10:28 AM, Matthias Bolte wrote:
2011/8/3 Eric Blake<eblake@redhat.com>:
On 08/03/2011 08:22 AM, Matthias Bolte wrote:
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. --- configure.ac | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-)
ACK for correctness.
However, I wonder if it is the most efficient. We aren't using this as a Makefile conditional, and LIBGNUTLS_VERSION_MAJOR is available at compile time. That is, I think that we could skip the configure check altogether, and just move the #if LIBGNUTLS_VERSION_MAJOR< 2 check into a common header used by all files that want to use gnutls in the first place, for a slightly smaller and faster configure.
Here's a v2 that does this.
Nicer - thanks for that work.
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.
ACK.
Thanks, pushed. -- Matthias Bolte http://photron.blogspot.com