diff options
author | Glenn Morris <rgm@gnu.org> | 2011-04-25 06:18:22 -0400 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2011-04-25 06:18:22 -0400 |
commit | e7d4e61f1ef1493a479e20db4d26f00f0116ec2a (patch) | |
tree | b47e5470da5645ac86ce540997c3967e71aebae7 /autogen | |
parent | 825cd63ca98121d602b4a8dcffa55d29841224a0 (diff) | |
download | emacs-e7d4e61f1ef1493a479e20db4d26f00f0116ec2a.tar.gz |
Auto-commit of generated files.
Diffstat (limited to 'autogen')
-rw-r--r-- | autogen/config.in | 7 | ||||
-rwxr-xr-x | autogen/configure | 22 |
2 files changed, 29 insertions, 0 deletions
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 |