Skip to content

several config fixes #17

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.

Sign up for GitHub

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

Merged
laruence merged 3 commits into from
Feb 25, 2015
Merged

several config fixes #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3b50a5
fix libluaYES suffix
tony2001 Feb 25, 2015
b95ae16
also fix "no" suffix
tony2001 Feb 25, 2015
adb5146
fix include dir
tony2001 Feb 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PHP_ARG_WITH(lua-version, to specify a custom lua version, [ --with-lua-version

if test "$PHP_LUA" != "no"; then
if test -r $PHP_LUA/include/lua.h; then
LUA_INCLUDE_DIR=$PHP_LUA
LUA_INCLUDE_DIR=$PHP_LUA/include
else
AC_MSG_CHECKING(for lua in default path)
for i in /usr/local /usr; do
Expand All @@ -30,10 +30,10 @@ if test "$PHP_LUA" != "no"; then
AC_MSG_ERROR(Please reinstall the lua distribution - lua.h should be in <lua-dir>/include/)
fi

if test "$PHP_LUA_VERSION" != "yes"; then
if test "$PHP_LUA_VERSION" != "yes" -a "$PHP_LUA_VERSION" != "no"; then
LUA_LIB_SUFFIX=lua$PHP_LUA_VERSION
else
LUA_LIB_SUFFIX=lua$PHP_LUA_VERSION
LUA_LIB_SUFFIX=lua
fi

LUA_LIB_NAME=lib$LUA_LIB_SUFFIX
Expand Down