From 3267c522ee1c74e9f6b72b9f6d3aead4f260c945 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 6 Jun 2019 04:41:53 -0700 Subject: [PATCH] configure: Fallback to AC_CHECK_LIB if PKG_CHECK_MODULES fails. --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d0bc0ed85..2ed2600ad 100644 --- a/configure.ac +++ b/configure.ac @@ -1049,8 +1049,15 @@ PKG_CHECK_MODULES(SODIUM, libsodium, 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]) + RB_CHK_SYSHEADER(sodium.h, [SODIUM_H]) + 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"])