From: Etienne Dechamps <etienne@edechamps.fr>
Date: Sun, 1 Sep 2013 19:07:32 +0000 (+0100)
Subject: Fix broken build with --with-openssl, --with-libgcrypt.
X-Git-Tag: release-1.1pre9~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c179dd0fc8ba0d20e8b29b0a5d2485a637e999e6;p=oweals%2Ftinc.git

Fix broken build with --with-openssl, --with-libgcrypt.

When --with-openssl is used, $openssl is set to the specified path.
Unfortunately, that confuses the OPENSSL conditional which expects it to
be set to "true". The result is that the contents of the openssl/
directory are not built when --with-openssl is used, resulting in
undefined references and a broken build.

In addition, there is a typo in the GCRYPT conditional definition
("grypt" instead of "gcrypt") which means GCRYPT never gets set,
(presumably) breaking builds using libgcrypt.

These regressions were introduced in
9b9230a0a79c670b86f54fadd2807b864ff9d91f.
---

diff --git a/configure.ac b/configure.ac
index 8b7c07a..465a3b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,8 +201,8 @@ else
 	tinc_OPENSSL
 fi
 	
-AM_CONDITIONAL(OPENSSL, test "$openssl" = true)
-AM_CONDITIONAL(GCRYPT, test "$grypt" = true)
+AM_CONDITIONAL(OPENSSL, test -n "$openssl")
+AM_CONDITIONAL(GCRYPT, test "$gcrypt" = true)
 
 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,