From: Glenn Morris <rgm@gnu.org>
Date: Mon, 25 Apr 2011 10:18:22 +0000 (-0400)
Subject: Auto-commit of generated files.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~215^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7d4e61f1ef1493a479e20db4d26f00f0116ec2a;p=emacs.git

Auto-commit of generated files.
---

diff --git a/autogen/config.in b/autogen/config.in
index f2ea751e2f8..a105f958ead 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -279,6 +279,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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
 
diff --git a/autogen/configure b/autogen/configure
index f433171636b..7068c284163 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -10813,6 +10813,7 @@ fi
 
 
 HAVE_GNUTLS=no
+HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no
 if test "${with_gnutls}" = "yes" ; then
 
   succeeded=no
@@ -10913,10 +10914,31 @@ $as_echo "no" >&6; }
 $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
 
   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
 
 
 
+
 HAVE_XAW3D=no
 LUCID_LIBW=
 if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then