From c3b50a5645a8f25fc0856580166ab52216b06b14 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 25 Feb 2015 15:26:31 +0300 Subject: [PATCH 1/3] fix libluaYES suffix --- config.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.m4 b/config.m4 index d5b73b6..094c551 100755 --- a/config.m4 +++ b/config.m4 @@ -33,7 +33,7 @@ if test "$PHP_LUA" != "no"; then if test "$PHP_LUA_VERSION" != "yes"; 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 From b95ae16c6f6b25e5cfa9e9fd2f4139a7681aabc1 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 25 Feb 2015 15:44:29 +0300 Subject: [PATCH 2/3] also fix "no" suffix --- config.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.m4 b/config.m4 index 094c551..9e9b5e1 100755 --- a/config.m4 +++ b/config.m4 @@ -30,7 +30,7 @@ if test "$PHP_LUA" != "no"; then AC_MSG_ERROR(Please reinstall the lua distribution - lua.h should be in /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 From adb5146954934942d711f327bf0ed09dc5afa4ad Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 25 Feb 2015 15:46:46 +0300 Subject: [PATCH 3/3] fix include dir --- config.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.m4 b/config.m4 index 9e9b5e1..ac18332 100755 --- a/config.m4 +++ b/config.m4 @@ -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