Merge pull request #1210 from pmienk/master

Correct libsodium inclusion.

Merge pull request #1210 from pmienk/master
Correct libsodium inclusion.
08d90e8a · Pieter Hintjens · eb89555a · 8cf5e9fd · 08d90e8a
Commit 08d90e8a authored Oct 16, 2014 by Pieter Hintjens
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

configure.ac configure.ac +5 -1

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -393,7 +393,11 @@ else
        [AC_MSG_WARN(libsodium is needed for CURVE security)])
 fi

-AM_CONDITIONAL(HAVE_SODIUM, test "x$have_sodium_library" = "xyes")
+if test "x$have_sodium_library" != "xno"; then
+AC_DEFINE(HAVE_LIBSODIUM, 1, [The libsodium library is to be used.])
+fi
+
+AM_CONDITIONAL(HAVE_SODIUM, test "x$have_sodium_library" != "xno")

 # build using pgm
 have_pgm_library="no"