From e4f8f47a6383ad086d68edc071bb701cfc5c0b28 Mon Sep 17 00:00:00 2001 From: Eugene Crosser Date: Tue, 29 Oct 2013 18:53:37 +0400 Subject: [PATCH] allow openss with tomcrypt --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d4b5562..6974af9 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,10 @@ AS_IF([test "x$OPENSSL_CFLAGS" != "x" -o "x$OPENSSL_LIBS" != "x" ], [ CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS" LIBS="$OPENSSL_LIBS $LIBS" -AS_IF([test "x$use_openssl" != "xyes"], [ +AC_ARG_ENABLE(enable_tomcrypt, + [ --enable-tomcrypt use libtomcrypt even when openssl present]) + +AS_IF([test "x$use_openssl" != "xyes" -o "x$enable_tomcrypt" = "xyes"], [ PKG_CHECK_MODULES([TOMCRYPT], [libtomcrypt], [], [:]) ]) AC_ARG_WITH(libtomcrypt-include-path, @@ -69,10 +72,10 @@ AS_IF([test "x$use_openssl" != "xyes" -a "x$use_tomcrypt" != "xyes"], [ ]) AS_IF([test "x$use_openssl" = "xyes"], [ - CRYPTO_OBJS+=ossl_crypto.lo + CRYPTO_OBJS+=" ossl_crypto.lo" ]) AS_IF([test "x$use_tomcrypt" = "xyes"], [ - CRYPTO_OBJS+=tom_crypto.lo + CRYPTO_OBJS+=" tom_crypto.lo" ]) AC_SUBST(CRYPTO_OBJS) -- 2.39.2