masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add certificate verify callback check for GnuTLS.

Browse source 
* configure.in: Check for GnuTLS certificate verify callbacks.
This commit is contained in:
Ted Zlatanov 2011-04-24 20:30:05 -05:00
parent fd4af8d902
commit 33630d5150
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2011-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
* Makefile.in (config.status): Don't erase in case of error. * Makefile.in (config.status): Don't erase in case of error.

10
configure.in
View file

@ -1972,12 +1972,22 @@ fi
AC_SUBST(LIBSELINUX_LIBS) AC_SUBST(LIBSELINUX_LIBS)
HAVE_GNUTLS=no HAVE_GNUTLS=no
HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no
if test "${with_gnutls}" = "yes" ; then if test "${with_gnutls}" = "yes" ; then
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.2.4], HAVE_GNUTLS=yes, HAVE_GNUTLS=no) PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.2.4], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
if test "${HAVE_GNUTLS}" = "yes"; then if test "${HAVE_GNUTLS}" = "yes"; then
AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.]) AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
fi 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 fi
AC_SUBST(LIBGNUTLS_LIBS) AC_SUBST(LIBGNUTLS_LIBS)
AC_SUBST(LIBGNUTLS_CFLAGS) AC_SUBST(LIBGNUTLS_CFLAGS)