scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 12:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed libsodium finding and checking

Browse Source
This commit is contained in:
git@daemon.de
2015-04-17 16:01:56 +02:00
parent 9737893e0a
commit 9237d8d1c1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -169,7 +169,7 @@ AC_ARG_WITH([libsodium-include-dir],
if test "x$search_libsodium_include" = "xyes"; then if test "x$search_libsodium_include" = "xyes"; then
if test -r "${with_libsodium_include_dir}/sodium.h"; then if test -r "${with_libsodium_include_dir}/sodium.h"; then
CFLAGS="-I${with_libsodium_include_dir}/include ${CFLAGS}" CFLAGS="-I${with_libsodium_include_dir} ${CFLAGS}"
_havenacl=yes _havenacl=yes
fi fi
fi fi
@@ -181,10 +181,10 @@ AC_ARG_WITH([libsodium_lib_dir],
[]) [])
if test "x$search_libsodium_lib" = "xyes"; then if test "x$search_libsodium_lib" = "xyes"; then
if test -r "${with_libsodium_lib_dir}/libsodium.{a|so|dylib}"; then if test -r "${with_libsodium_lib_dir}/libsodium.dylib" -o -r "${with_libsodium_lib_dir}/libsodium.so" -o -r "${with_libsodium_lib_dir}/libsodium.a"; then
LDFLAGS="-L${with_libsodium}/lib ${LDFLAGS}" LDFLAGS="-L${with_libsodium_lib_dir} ${LDFLAGS}"
_havenacl=yes _havenacl=yes
_ldlib="${with_libsodium}/lib" _ldlib="${with_libsodium_lib_dir}"
fi fi
fi fi
@@ -204,6 +204,9 @@ fi
if test "x${_havenacl}" != "xno" -a "x$cross_compile" = "xno"; then if test "x${_havenacl}" != "xno" -a "x$cross_compile" = "xno"; then
LIBS="-lsodium" # gcc LIBS="-lsodium" # gcc
export LDFLAGS="$LDFLAGS"
export CFLAGS="$CFLAGS"
export LIBS="$LIBS"
AC_MSG_CHECKING([libsodium version compatible]) AC_MSG_CHECKING([libsodium version compatible])
AC_RUN_IFELSE([ AC_RUN_IFELSE([
AC_LANG_PROGRAM([[ AC_LANG_PROGRAM([[
@@ -265,7 +268,6 @@ case "$host" in
*-*-ultrix*) ;; *-*-ultrix*) ;;
*-*-lynxos) ;; *-*-lynxos) ;;
esac esac
AC_CHECK_LIB(sodium, sodium_init, , [AC_MSG_ERROR([cannot link with -lsodium, install libsodium.])]) AC_CHECK_LIB(sodium, sodium_init, , [AC_MSG_ERROR([cannot link with -lsodium, install libsodium.])])
if test -n "$_ldlib"; then if test -n "$_ldlib"; then