From 8fc19a60374867b3fd18cf1f2193bf82002fda11 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 20 Jan 2015 14:37:43 -0500 Subject: [PATCH] FS-7180: properly build esl luamod when not using the --enable-system-lua configure arg --- configure.ac | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index b483f8f8e7..2e61464d58 100644 --- a/configure.ac +++ b/configure.ac @@ -518,17 +518,15 @@ AC_SUBST(SYS_XMLRPC_LDFLAGS) AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"]) AC_ARG_ENABLE([system-lua],[AS_HELP_STRING([--enable-system-lua],[use system lib for lua])],,[enable_system_lua="no"]) -if test "${enable_system_lua}" = "yes" ; then - PKG_CHECK_MODULES([LUA],[lua5.2],[have_lua=yes],[have_lua=no]) - if test "${have_lua}" = "no" ; then - PKG_CHECK_MODULES([LUA],[lua5.1],[have_lua=yes],[have_lua=no]) - fi - if test "${have_lua}" = "no" ; then - PKG_CHECK_MODULES([LUA],[lua],[have_lua=yes],[have_lua=no]) - fi - if test x"${LUA_LIBS}" = x"" ; then - LUA_LIBS="-llua" - fi +PKG_CHECK_MODULES([LUA],[lua5.2],[have_lua=yes],[have_lua=no]) +if test "${have_lua}" = "no" ; then + PKG_CHECK_MODULES([LUA],[lua5.1],[have_lua=yes],[have_lua=no]) +fi +if test "${have_lua}" = "no" ; then + PKG_CHECK_MODULES([LUA],[lua],[have_lua=yes],[have_lua=no]) +fi +if test x"${LUA_LIBS}" = x"" ; then + LUA_LIBS="-llua" fi AM_CONDITIONAL([SYSTEM_LUA],[test "${enable_system_lua}" = "yes"])