]> git.meshlink.io Git - meshlink/commitdiff
Fix broken build with --with-openssl, --with-libgcrypt.
authorEtienne Dechamps <etienne@edechamps.fr>
Sun, 1 Sep 2013 19:07:32 +0000 (20:07 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 1 Sep 2013 19:24:59 +0000 (21:24 +0200)
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.

configure.ac

index 8b7c07a6488c9d44a94451336b7995fd09fd0d6d..465a3b4bfcdc8890aedec0a2b53eccdfcf89525d 100644 (file)
@@ -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,