X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=4b6d8ab840263e0c4a3ca72acf241c31cb783f76;hb=b7d59f035bfa2e546428cac2b72318d4f5c517fb;hp=28d94a6260fb26adadb012c7c284692a305a918f;hpb=283c5d1cf07f77d29fc1fc2f09532508f5124679;p=meshlink

diff --git a/configure.ac b/configure.ac
index 28d94a62..4b6d8ab8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,7 @@ if test -d /sw/lib ; then
 fi
 
 dnl Compiler hardening flags
+dnl No -fstack-protector-all because it doesn't work on all platforms or architectures.
 
 AC_ARG_ENABLE([hardening], AS_HELP_STRING([--disable-hardening], [disable compiler and linker hardening flags]))
 AS_IF([test "x$enable_hardening" != "xno"],
@@ -144,10 +145,8 @@ AS_IF([test "x$enable_hardening" != "xno"],
      *mingw*)
        AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [LDFLAGS="$LDFLAGS -Wl,--dynamicbase"])
        AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"])
-       # TODO: get -fstack-protector-all working with MinGW
        ;;
      *)
-       AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [CPPFLAGS="$CPPFLAGS -fstack-protector-all"])
        AX_CHECK_COMPILE_FLAG([-fPIE], [CPPFLAGS="$CPPFLAGS -fPIE"])
        AX_CHECK_LINK_FLAG([-pie], [LDFLAGS="$LDFLAGS -pie"])
        ;;
@@ -217,18 +216,18 @@ tinc_READLINE
 tinc_ZLIB
 tinc_LZO
 
-if test "$with_libgcrypt" = yes; then
+if test "x$with_libgcrypt" != "xno"; then
 	gcrypt=true
-	AM_PATH_LIBGCRYPT([1.4.0], [], [])
+	tinc_LIBGCRYPT
 else
 	openssl=true
 	tinc_OPENSSL
 fi
 	
 AM_CONDITIONAL(OPENSSL, test -n "$openssl")
-AM_CONDITIONAL(GCRYPT, test "$gcrypt" = true)
+AM_CONDITIONAL(GCRYPT, test -n "$gcrypt")
 
-dnl Check if support for jumbograms is requested 
+dnl Check if support for jumbograms is requested
 AC_ARG_ENABLE(jumbograms,
   AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
   [ AS_IF([test "x$enable_jumbograms" = "xyes"],