[Emacs-diffs] /srv/bzr/emacs/trunk r104002: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 104002
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-04-25 06:18:22 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/config.in
  autogen/configure

=== modified file 'autogen/config.in'
--- a/autogen/config.in 2011-04-08 18:53:26 +0000
+++ b/autogen/config.in 2011-04-25 10:18:22 +0000
@@ -279,6 +279,13 @@
 /* Define if using GnuTLS. */
 #undef HAVE_GNUTLS
 
+/* Define if using GnuTLS certificate verification callbacks. */
+#undef HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY
+
+/* Define to 1 if you have the `gnutls_certificate_set_verify_function'
+   function. */
+#undef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION
+
 /* Define to 1 if you have the gpm library (-lgpm). */
 #undef HAVE_GPM
 

=== modified file 'autogen/configure'
--- a/autogen/configure 2011-04-20 10:18:10 +0000
+++ b/autogen/configure 2011-04-25 10:18:22 +0000
@@ -10813,6 +10813,7 @@
 
 
 HAVE_GNUTLS=no
+HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no
 if test "${with_gnutls}" = "yes" ; then
 
   succeeded=no
@@ -10913,7 +10914,28 @@
 $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
 
   fi
-fi
+
+  CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+  LIBS="$LIBGNUTLS_LIBS $LIBS"
+  for ac_func in gnutls_certificate_set_verify_function
+do :
+  ac_fn_c_check_func "$LINENO" "gnutls_certificate_set_verify_function" 
"ac_cv_func_gnutls_certificate_set_verify_function"
+if test "x$ac_cv_func_gnutls_certificate_set_verify_function" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION 1
+_ACEOF
+ HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=yes
+fi
+done
+
+
+  if test "${HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY}" = "yes"; then
+
+$as_echo "#define HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY 1" >>confdefs.h
+
+  fi
+fi
+