diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-28 19:00:15 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-28 19:00:15 -0800 |
| commit | 9875d23d86c0668b1e697b67a394560d66c7826d (patch) | |
| tree | 9cc6f0ea4ff97df0973bc2dd5f588b822c300ff7 | |
| parent | 91191bd4b516b34176f395cdffff21ab71248536 (diff) | |
* configure.ac: Simplify gnutls tests.
Ref: http://debbugs.gnu.org/19168#21
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 8 insertions, 10 deletions
@@ -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. diff --git a/configure.ac b/configure.ac index 70592d97e0..010abc8544 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |