j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Replace bare if statements with AS_IF in configure.ac.

Browse source
This commit is contained in:
Guus Sliepen 2015-09-24 22:20:00 +02:00
parent f54a87b800
commit 706d855e50
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
configure.ac
View file

@ -138,12 +138,8 @@ AM_CONDITIONAL(WITH_SYSTEMD, test "$systemd" = true)
AC_CACHE_SAVE AC_CACHE_SAVE
if test -d /sw/include ; then AS_IF([test -d /sw/include], [CPPFLAGS="$CPPFLAGS -I/sw/include"])
CPPFLAGS="$CPPFLAGS -I/sw/include" AS_IF([test -d /sw/lib], [LIBS="$LIBS -L/sw/lib"])
fi
if test -d /sw/lib ; then
LIBS="$LIBS -L/sw/lib"
fi
dnl Compiler hardening flags dnl Compiler hardening flags
dnl No -fstack-protector-all because it doesn't work on all platforms or architectures. dnl No -fstack-protector-all because it doesn't work on all platforms or architectures.
@ -241,15 +237,12 @@ tinc_READLINE
tinc_ZLIB tinc_ZLIB
tinc_LZO tinc_LZO
if test "x$enable_legacy_protocol" != "xno"; then AS_IF([test "x$enable_legacy_protocol" != "xno"],
if test -n "$with_libgcrypt"; then [AS_IF([test -n "$with_libgcrypt"],
gcrypt=true [gcrypt=true; tinc_LIBGCRYPT],
tinc_LIBGCRYPT [openssl=true; tinc_OPENSSL])
else ]
openssl=true )
tinc_OPENSSL
fi
fi
AM_CONDITIONAL(OPENSSL, test -n "$openssl") AM_CONDITIONAL(OPENSSL, test -n "$openssl")
AM_CONDITIONAL(GCRYPT, test -n "$gcrypt") AM_CONDITIONAL(GCRYPT, test -n "$gcrypt")