Move lua check to separate macro

diff --git a/configure.ac b/configure.ac
index 96a0cb6d2c1d0a6fa72f6abbc140c1659f5f18cc..b65789e52da476b1f16a9e530d2d574fb63d51f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,42 +24,13 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_LANG([C++])
 
-AC_CHECK_PROG([RAGEL], [ragel], [ragel])
-AC_CHECK_PROG([ASCIIDOC], [asciidoc], [asciidoc])
-
-dnl Check for lua
-AC_MSG_CHECKING(if with lua)
-AC_ARG_WITH(lua, AS_HELP_STRING([--with-lua],[use Lua]), [WITH_LUA=$withval],[WITH_LUA=yes])
-
 # detect pkg-config explicitly
 PKG_PROG_PKG_CONFIG
 
-AC_MSG_RESULT($WITH_LUA)
-if test "$WITH_LUA" != "no"; then
- # try pkgconfig
- if test "$WITH_LUA" = "yes"; then
-      LUAPC=lua
- else
-      LUAPC=$WITH_LUA
- fi
- PKG_CHECK_MODULES(LUA, $LUAPC >= 5.1, [
-       AC_DEFINE([HAVE_LUA], [1], [liblua])
-        AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-        ],[
-        PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
-               AC_DEFINE([HAVE_LUA], [1], [liblua])
-                AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-        ],[
-        PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [
-               AC_DEFINE([HAVE_LUA], [1], [liblua])
-                AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-                ]) 
-                ]) 
-        ])
- AC_SUBST(LUA_CFLAGS)
- AC_SUBST(LUA_LIBS)
-fi
+AC_CHECK_PROG([RAGEL], [ragel], [ragel])
+AC_CHECK_PROG([ASCIIDOC], [asciidoc], [asciidoc])
 
+PDNS_WITH_LUA
 
 AM_CONDITIONAL([RELEASE_BUILD], [test "$PACKAGE_VERSION" != "git"])
 
@@ -74,6 +45,8 @@ if test x"$enable_unit_tests" = "xyes"; then
 fi
 #BOOST_SYSTEM([mt])
 
+
+
 dnl Allow user to require SQLite3
 AC_MSG_CHECKING(whether user requires sqlite3)
 AC_ARG_WITH(sqlite3, AS_HELP_STRING([--with-sqlite3],[include sqlite3 driver]), [WITH_SQLITE3=$withval],[WITH_SQLITE3=no])

diff --git a/m4/pdns_with_lua.m4 b/m4/pdns_with_lua.m4
new file mode 100644 (file)
index 0000000..3d7e7d3
--- /dev/null
+++ b/m4/pdns_with_lua.m4
@@ -0,0 +1,37 @@
+AC_DEFUN([PDNS_WITH_LUA],[
+  dnl Check for lua
+  AC_ARG_WITH([lua],
+    [AS_HELP_STRING([--with-lua],
+      [Build Lua Bindings @<:@default=yes@:>@])],
+    [with_lua=$withval],
+    [with_lua=yes])
+
+  AS_IF([test "x$with_lua" != "xno"],[
+    AS_IF([test "x$with_lua" = "xyes"],
+      [LUAPC=lua],
+      [LUAPC=$with_lua])
+
+    PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
+      AC_DEFINE([HAVE_LUA], [1], [liblua])
+      AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
+      with_lua=yes
+    ],[
+      LUAPC=lua5.1
+      PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
+        AC_DEFINE([HAVE_LUA], [1], [liblua])
+        AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
+        with_lua=yes
+      ],[
+        LUAPC=lua-5.1
+        PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
+          AC_DEFINE([HAVE_LUA], [1], [liblua])
+          AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
+          with_lua=yes
+        ],[
+          AC_DEFINE([HAVE_LUA],["x"],["x"])
+          with_lua=no
+        ])
+      ])
+    ])
+  ])
+])