From: Natanael Copa Date: Fri, 6 Sep 2013 07:08:45 +0000 (+0200) Subject: lua: fix logic to enable lua support in configure X-Git-Tag: lxc-1.0.0.alpha1~1^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69c757b343b5bbd2543adc4f3f0204d4696515e0;p=thirdparty%2Flxc.git lua: fix logic to enable lua support in configure 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 Acked-by: Stéphane Graber --- diff --git a/configure.ac b/configure.ac index 0909da30b..481bf0627 100644 --- a/configure.ac +++ b/configure.ac @@ -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],