MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-02 01:59:33 +02:00
Code Issues Releases Wiki Activity

configure: Fix PKG_CHECK_MODULES caps; checks for libsodium.

Browse source
This commit is contained in:
Jason Volk 2020-05-09 17:06:38 -07:00
parent d56c538db7
commit 1e6de11d4e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -1295,17 +1295,15 @@ 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, PKG_CHECK_MODULES(sodium, libsodium,
[ [
have_sodium="yes" have_sodium="yes"
], [ ], [
dnl NOTE that PKG_CHECK_MODULES is preferred, but on some systems it gives 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. dnl a false negative and we end up here with an AC_CHECK_LIB fallback.
RB_CHK_SYSHEADER(sodium.h, [SODIUM_H])
AC_CHECK_LIB([sodium], sodium_init, AC_CHECK_LIB([sodium], sodium_init,
[ [
have_sodium="yes" have_sodium="yes"
SODIUM_LIBS+=" -lsodium"
], [ ], [
have_sodium="no" have_sodium="no"
]) ])
@ -1315,7 +1313,9 @@ AM_CONDITIONAL([SODIUM], [test "x$have_sodium" = "xyes"])
AM_COND_IF([SODIUM], AM_COND_IF([SODIUM],
[ [
RB_CHK_SYSHEADER(sodium.h, [SODIUM_H])
AC_DEFINE([HAVE_SODIUM], [1], [Have libsodium]) 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]) AC_MSG_ERROR([libsodium is required but not found. Try apt-get install libsodium-dev])
]) ])