]> git.proxmox.com Git - mirror_lxc.git/commitdiff
lua: fix logic to enable lua support in configure
authorNatanael Copa <ncopa@alpinelinux.org>
Fri, 6 Sep 2013 07:08:45 +0000 (09:08 +0200)
committerStéphane Graber <stgraber@ubuntu.com>
Fri, 6 Sep 2013 13:14:28 +0000 (09:14 -0400)
When there is no --enable-lua or --with-lua-pc, Lua should not be
enabled.

This fixes a bug introduced with 12e93188 (configure/makefile:
Allow specify Lua pkg-config file with --with-lua-pc) that caused
configure script to fail if lua headers was missing.

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
configure.ac

index 0909da30bd9be479b6bd6d63d3aa1b0cea706630..481bf0627c72e296eeba03cd706cbbcb5e8522e0 100644 (file)
@@ -182,13 +182,13 @@ AC_ARG_WITH([lua-pc],
                [Specify pkg-config package name for lua]
        )],
        [LUAPKGCONFIG=$with_lua_pc
-       enable_lua=yes], [with_lua_pc=auto])
+       enable_lua=yes])
 
 AM_CONDITIONAL([ENABLE_LUA],
-       [test "x$enable_lua" = "xyes" -o "xwith_lua_pc != xno"])
+       [test "x$enable_lua" = "xyes"])
 
 AM_COND_IF([ENABLE_LUA],
-       [AS_IF([test "x$with_lua_pc" = "xauto"],
+       [AS_IF([test "x$with_lua_pc" = "xyes"],
                [PKG_CHECK_MODULES([LUA], [lua],[LUAPKGCONFIG=lua],
                        [PKG_CHECK_MODULES([LUA], [lua5.2],[LUAPKGCONFIG=lua5.2],
                                [PKG_CHECK_MODULES([LUA], [lua5.1],