From 6aae730d5a42ede6b7f7a190d07ffc16b2339064 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 13 Jun 2019 13:51:49 -0600 Subject: [PATCH] configure: Improve sodium related macros; fix missing SODIUM_LIBS assignment. --- configure.ac | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 9aa1b9708..ee72d18b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1064,19 +1064,18 @@ AC_SUBST(SODIUM_LIBS, []) AC_ARG_WITH(sodium-includes, AC_HELP_STRING([--with-sodium-includes=[[[DIR]]]], [Path to sodium include directory]), [ - SODIUM_CPPFLAGS="-I$withval" + SODIUM_CPPFLAGS+="-I$withval" ], []) AC_ARG_WITH(sodium-libs, AC_HELP_STRING([--with-sodium-libs=[[[DIR]]]], [Path to sodium library directory]), [ - SODIUM_LDFLAGS="-L$withval" + SODIUM_LDFLAGS+="-L$withval" ], []) PKG_CHECK_MODULES(SODIUM, libsodium, [ have_sodium="yes" - AC_DEFINE([HAVE_SODIUM], [1], [Have libsodium]) ], [ dnl NOTE that PKG_CHECK_MODULES is preferred, but on some systems it gives dnl a false negative and we end up here with an AC_CHECK_LIB fallback. @@ -1084,15 +1083,21 @@ PKG_CHECK_MODULES(SODIUM, libsodium, AC_CHECK_LIB([sodium], sodium_init, [ have_sodium="yes" - AC_DEFINE([HAVE_SODIUM], [1], [Have libsodium]) ], [ have_sodium="no" - AC_MSG_ERROR([libsodium is required but not found. Try apt-get install libsodium-dev]) ]) ]) AM_CONDITIONAL([SODIUM], [test "x$have_sodium" = "xyes"]) +AM_COND_IF([SODIUM], +[ + AC_DEFINE([HAVE_SODIUM], [1], [Have libsodium]) + SODIUM_LIBS+="-lsodium" +], [ + AC_MSG_ERROR([libsodium is required but not found. Try apt-get install libsodium-dev]) +]) + dnl dnl dnl OpenSSL support