procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.ac: Simplify gnutls tests.

Browse source 
Ref: http://debbugs.gnu.org/19168#21
This commit is contained in:
Glenn Morris 2014-11-28 19:00:15 -08:00
parent 91191bd4b5
commit 9875d23d86
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2014-11-29 Glenn Morris <rgm@gnu.org>
* configure.ac: Simplify gnutls tests.
2014-11-28 Stefan Monnier <monnier@iro.umontreal.ca>
* .gitignore: Add entries for emacsvers files.

14
configure.ac
View file

@ -2599,19 +2599,13 @@ fi
AC_SUBST(LIBSELINUX_LIBS)
HAVE_GNUTLS=no
HAVE_GNUTLS3=no
if test "${with_gnutls}" = "yes" ; then
EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.0],
[HAVE_GNUTLS3=yes], [HAVE_GNUTLS3=no])
if test "${HAVE_GNUTLS3}" = "yes"; then
AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])
HAVE_GNUTLS="yes"
else
EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6],
[HAVE_GNUTLS=yes], [HAVE_GNUTLS=no])
fi
EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6],
[HAVE_GNUTLS=yes], [HAVE_GNUTLS=no])
if test "${HAVE_GNUTLS}" = "yes"; then
AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
EMACS_CHECK_MODULES([LIBGNUTLS3], [gnutls >= 3.0.0],
[AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])], [])
fi
# Windows loads GnuTLS dynamically