diff options
| author | Stefan Bühler <stbuehler@web.de> | 2013-07-31 20:23:23 +0000 |
|---|---|---|
| committer | Stefan Bühler <stbuehler@web.de> | 2013-07-31 20:23:23 +0000 |
| commit | f8e9462d2f7556edcc1d0cf09ac7321fa339d057 (patch) | |
| tree | 41f03aa73237af48755dc1770df12016263e6ca1 | |
| parent | 05858f6cf2d93f49c8995aed05e79b7bc68538b3 (diff) | |
| download | lighttpd-git-f8e9462d2f7556edcc1d0cf09ac7321fa339d057.tar.gz | |
[autoconf] pkg-config: search for lua5.1 and lua-5.1 before lua
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2888 152afb58-edef-0310-8abb-c4023f1b3aa9
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 5c636fa0..e5d15da7 100644 --- a/configure.ac +++ b/configure.ac @@ -467,21 +467,21 @@ if test "$WITH_LUA" != "no"; then if test "$WITH_LUA" = "yes"; then WITH_LUA=lua fi - PKG_CHECK_MODULES(LUA, $WITH_LUA >= 5.1, [ - AC_DEFINE([HAVE_LUA], [1], [liblua]) - AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) - ],[ - dnl for debian based systems + dnl first check for lua5.1 (debian and others), then lua-5.1 (freebsd), then $WITH_LUA (defaults to lua) + dnl check "lua" last now that lua5.2 is out PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [ - AC_DEFINE([HAVE_LUA], [1], [liblua]) - AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) ],[ - dnl for freebsd - PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [ + PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [ AC_DEFINE([HAVE_LUA], [1], [liblua]) AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) - ]) - ]) + ],[ + PKG_CHECK_MODULES(LUA, $WITH_LUA >= 5.1, [ + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) + ]) + ]) ]) AC_SUBST(LUA_CFLAGS) |