mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
Fixing linker issue on linux when DIR is specified on --with-argon2
This commit is contained in:
parent
d3986572a9
commit
f4aa3a465b
@ -558,28 +558,24 @@ PHP_ARG_WITH(argon2, for Argon2 support,
|
|||||||
|
|
||||||
if test "$PHP_ARGON2" != "no"; then
|
if test "$PHP_ARGON2" != "no"; then
|
||||||
AC_MSG_CHECKING([for Argon2 library])
|
AC_MSG_CHECKING([for Argon2 library])
|
||||||
if test "$PHP_ARGON2" = "yes"; then
|
for i in $PHP_ARGON2 /usr /usr/local ; do
|
||||||
SEARCH_PATH="/usr /usr/lib /usr/local /usr/local/share /usr/share"
|
if test -r $i/include/argon2.h; then
|
||||||
else
|
|
||||||
SEARCH_PATH="$PHP_ARGON2"
|
|
||||||
fi
|
|
||||||
for i in $SEARCH_PATH ; do
|
|
||||||
if test -r $i/libargon2.so; then
|
|
||||||
ARGON2_DIR=$i;
|
ARGON2_DIR=$i;
|
||||||
AC_MSG_RESULT(found in $i)
|
AC_MSG_RESULT(found in $i)
|
||||||
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if test -z "$ARGON2_DIR"; then
|
if test -z "$ARGON2_DIR"; then
|
||||||
AC_MSG_RESULT([not found])
|
AC_MSG_RESULT([not found])
|
||||||
AC_MSG_ERROR([Please ensure the argon2 headers and static library are installed])
|
AC_MSG_ERROR([Please ensure the argon2 header and library are installed])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
PHP_ADD_LIBRARY_WITH_PATH(argon2, $ARGON2_DIR)
|
||||||
PHP_ADD_INCLUDE($ARGON2_DIR/include)
|
PHP_ADD_INCLUDE($ARGON2_DIR/include)
|
||||||
|
|
||||||
AC_CHECK_HEADERS([argon2.h])
|
|
||||||
AC_CHECK_LIB(argon2, argon2_hash, [
|
AC_CHECK_LIB(argon2, argon2_hash, [
|
||||||
LIBS="-largon2 $LIBS -largon2"
|
LIBS="$LIBS -largon2"
|
||||||
AC_DEFINE(HAVE_ARGON2LIB, 1, [ Define to 1 if you have the <argon2.h> header file ])
|
AC_DEFINE(HAVE_ARGON2LIB, 1, [ Define to 1 if you have the <argon2.h> header file ])
|
||||||
], [
|
], [
|
||||||
AC_MSG_ERROR([Problem with libargon2.(a|so). Please verify that Argon2 header and libaries are installed])
|
AC_MSG_ERROR([Problem with libargon2.(a|so). Please verify that Argon2 header and libaries are installed])
|
||||||
|
Loading…
Reference in New Issue
Block a user