diff options
| author | Jan Kneschke <jan@kneschke.de> | 2005-09-06 09:48:17 +0000 |
|---|---|---|
| committer | Jan Kneschke <jan@kneschke.de> | 2005-09-06 09:48:17 +0000 |
| commit | bccca062f3431b180828ef929294e13e679c4c8f (patch) | |
| tree | 24b16798d126dd4e18e3e6ae61eb1c28bb6e3572 /configure.in | |
| parent | aa1814fb1f13eb16262f8602cd3666a60e380fda (diff) | |
| download | lighttpd-git-bccca062f3431b180828ef929294e13e679c4c8f.tar.gz | |
try pkg-config for lua if all other tests fail (fixed #247, #254, #209)
git-svn-id: svn+ssh://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@689 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/configure.in b/configure.in index d63bfb1e..8148c2b9 100644 --- a/configure.in +++ b/configure.in @@ -354,20 +354,32 @@ AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[lua engine for mod_cml]), AC_MSG_RESULT($WITH_LUA) if test "$WITH_LUA" != "no"; then AC_PATH_PROG(LUACONFIG, lua-config) + if test x"$LUACONFIG" != x; then LUA_CFLAGS=`$LUACONFIG --include` - LUA_LIB=`$LUACONFIG --libs --extralibs` + LUA_LIBS=`$LUACONFIG --libs --extralibs` + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) else AC_CHECK_LIB(lua, lua_open, [ - AC_CHECK_HEADERS([lua.h],[ - LUA_LIB="-llua -llualib" - AC_DEFINE([HAVE_LUA], [1], [liblua]) - AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) - ]) + AC_CHECK_HEADERS([lua.h],[ + LUA_LIBS="-llua -llualib" + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) + ]) + ]) + fi + + if test x"$LUA_LIBS" = x; then + # try pkgconfig + PKG_CHECK_MODULES(LUA, lua, [ + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) ]) fi + AC_SUBST(LUA_CFLAGS) - AC_SUBST(LUA_LIB) + AC_SUBST(LUA_LIBS) fi @@ -536,7 +548,7 @@ else fi plugins="mod_cml" -if test ! "x$LUA_LIB" = x; then +if test ! "x$LUA_LIBS" = x; then do_build="$do_build $plugins" else no_build="$no_build $plugins" |