[Emacs-diffs] /srv/bzr/emacs/trunk r103997: Add certificate verify callback check for GnuTLS.

[Ted Zlatanov]

------------------------------------------------------------
revno: 103997
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Sun 2011-04-24 20:30:05 -0500
message:
  Add certificate verify callback check for GnuTLS.
  
  * configure.in: Check for GnuTLS certificate verify callbacks.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-04-23 03:07:16 +0000
+++ b/ChangeLog 2011-04-25 01:30:05 +0000
@@ -1,3 +1,7 @@
+2011-04-24  Teodor Zlatanov  <address@hidden>
+
+       * configure.in: Check for GnuTLS certificate verify callbacks.
+
 2011-04-20  Stefan Monnier  <address@hidden>
 
        * Makefile.in (config.status): Don't erase in case of error.

=== modified file 'configure.in'
--- a/configure.in      2011-04-20 02:18:13 +0000
+++ b/configure.in      2011-04-25 01:30:05 +0000
@@ -1972,12 +1972,22 @@
 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)