From: Ted Zlatanov <tzz@lifelogs.com>
Date: Mon, 25 Apr 2011 01:30:05 +0000 (-0500)
Subject: Add certificate verify callback check for GnuTLS.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~215^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33630d51504adc5b2a0289f356c0a1a49f0bd10a;p=emacs.git

Add certificate verify callback check for GnuTLS.

* configure.in: Check for GnuTLS certificate verify callbacks.
---

diff --git a/ChangeLog b/ChangeLog
index 7fcdef4272b..3a729327bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* configure.in: Check for GnuTLS certificate verify callbacks.
+
 2011-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* Makefile.in (config.status): Don't erase in case of error.
diff --git a/configure.in b/configure.in
index d20dee81e5b..b4b4330fd17 100644
--- a/configure.in
+++ b/configure.in
@@ -1972,12 +1972,22 @@ fi
 AC_SUBST(LIBSELINUX_LIBS)
 
 HAVE_GNUTLS=no
+HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no
 if test "${with_gnutls}" = "yes" ; then
   PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.2.4], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
   if test "${HAVE_GNUTLS}" = "yes"; then
     AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
   fi
+
+  CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+  LIBS="$LIBGNUTLS_LIBS $LIBS"
+  AC_CHECK_FUNCS(gnutls_certificate_set_verify_function, HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=yes)
+
+  if test "${HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY}" = "yes"; then
+    AC_DEFINE(HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY, 1, [Define if using GnuTLS certificate verification callbacks.])
+  fi
 fi
+
 AC_SUBST(LIBGNUTLS_LIBS)
 AC_SUBST(LIBGNUTLS_CFLAGS)