X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e56a4e39d6306b23fde3194b11a1c09dddbcd65f..52391b538640f320acb25a66b673042c51567f61:/configure.ac?ds=sidebyside

diff --git a/configure.ac b/configure.ac
index 846466f8..df70c7ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,9 +42,9 @@ AS_IF([test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"],[
 
 dnl Do you want client-side support for encryption with TLS?
 AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
-AS_IF([test x"$with_tls" != x -a x"$with_tls" != x"no"],[
+AS_IF([test x"$with_tls" != x"no"],[
       AC_DEFINE([TLS_SUPPORT], [1], [Support TLS for session encryption.])dnl
-      tls_support=no],[tls_support=yes])
+      tls_support=yes],[tls_support=no])
 
 dnl Set the backup prefix
 AC_ARG_WITH([hash-backup],
@@ -496,14 +496,14 @@ dnl ----------------
 dnl CHECK FLEX FIXUP
 dnl ----------------
 dnl Use LFLAGS make variable setting to work around bugs in flex
-dnl 2.5.36 that cause signed/unsigned mismatch,
+dnl 2.5.36-37 that cause signed/unsigned mismatch,
 dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
       [AS_CASE([`$LEX -V`],
                [flex\ 2.5.35], [LFLAGS=\
-'; sed -e "s/	int n;/	size_t n;/" $@ >$@.tmp && mv -f $@.tmp $@; true'],
-               [flex\ 2.5.36], [LFLAGS=\
-'; sed -s "s/\(	\)int i;/\1yy_size_t i;/" $@ >$@.tmp && mv -f $@.tmp $@; true'])
+'; sed "s/	int n;/	size_t n;/" $@ >$@.tmp && mv -f $@.tmp $@'],
+               [flex\ 2.5.3[[67]]], [LFLAGS=\
+'; sed "s/\(	\)int i;/\1yy_size_t i;/" $@ >$@.tmp && mv -f $@.tmp $@'])
        AC_SUBST([LFLAGS])])
 
 dnl ----------------