Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed checks for lzf when headers are inside include/liblzf (ubuntu 20.04) #1778

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,16 @@ if test "$PHP_REDIS" != "no"; then
if test -r $i/include/lzf.h; then
AC_MSG_RESULT(found in $i)
LIBLZF_DIR=$i
LIBLZF_INCLUDE_DIR=$i/include
break
fi
if test -r $i/include/liblzf/lzf.h; then
AC_MSG_RESULT(found in $i)
LIBLZF_DIR=$i
LIBLZF_INCLUDE_DIR=$i/include/liblzf
PHP_ADD_INCLUDE($LIBLZF_INCLUDE_DIR)
break
fi
done
if test -z "$LIBLZF_DIR"; then
AC_MSG_RESULT([not found])
Expand All @@ -183,7 +191,7 @@ if test "$PHP_REDIS" != "no"; then
], [
AC_MSG_ERROR([could not find usable liblzf])
], [
-L$LIBLZF_DIR/$PHP_LIBDIR
-L$LIBLZF_DIR/$PHP_LIBDIR -I$LIBLZF_INCLUDE_DIR
])
PHP_SUBST(REDIS_SHARED_LIBADD)
else
Expand Down