move back to old lua checks, to use lua5.2, use --with-lua=lua5.2

diff --git a/configure.ac b/configure.ac
index 0869506270ee72b48356c8ac587e14f689fb03c7..04e0d70d98ec86925b4a9683e5d75257804eb45a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,37 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_LANG_CPLUSPLUS
 
+dnl Check for lua
+AC_MSG_CHECKING(if with lua)
+AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[use Lua]), [WITH_LUA=$withval],[WITH_LUA=yes])
+
+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
+
+
 AM_CONDITIONAL([RELEASE_BUILD], [test "$PACKAGE_VERSION" != "git"])
 
 BOOST_REQUIRE([1.34])
@@ -40,32 +71,6 @@ fi
 # detect pkg-config explicitly
 PKG_PROG_PKG_CONFIG
 
-dnl Check for lua
-AC_MSG_CHECKING(if with lua)
-AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[use Lua]), [WITH_LUA=$withval],[WITH_LUA=yes])
-
-AX_PROG_LUA(5.0,,,)
-
-AX_LUA_LIBS(
-       [
-               AC_DEFINE([HAVE_LUA], [1], [liblua])
-       ], 
-       [ 
-               AC_MSG_RESULT(Not found)        
-       ]
-       )
-
-AX_LUA_HEADERS(
-       [
-               AC_DEFINE([HAVE_LUA_H], [1], [lua.h])    
-       ], 
-       [
-               AC_MSG_RESULT(Not found)
-       ]
-       )
-
-AC_SUBST(LUA_LIB)
-AC_SUBST(LUA_INCLUDE)
 
 dnl Allow user to require SQLite3
 AC_MSG_CHECKING(whether user requires sqlite3)

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 4eef10695c750b24d8fff303cb7b8059010dcc7c..12c1b930c290cca5ef64075d3dc8b18d977654ff 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_LIBPOLARSSL
-AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_INCLUDE) $(SQLITE3_CFLAGS) -I ext/rapidjson/include
+AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -I ext/rapidjson/include
 else
-AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_INCLUDE) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -Iext/rapidjson/include
+AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -Iext/rapidjson/include
 
 endif
 AM_CPPFLAGS=-Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS)
@@ -71,7 +71,7 @@ version.hh version.cc
 
 #
 pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
-pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIB) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
+pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
 
 if BOTAN110
 pdns_server_SOURCES += botan110signers.cc botansigners.cc
@@ -266,7 +266,7 @@ lua-pdns.cc lua-pdns.hh lua-recursor.cc lua-recursor.hh randomhelper.cc  \
 recpacketcache.cc recpacketcache.hh dns.cc nsecrecords.cc base32.cc cachecleaner.hh json_ws.cc json_ws.hh \
 json.cc json.hh version.hh version.cc
 
-pdns_recursor_LDFLAGS= $(LUA_LIB)
+pdns_recursor_LDFLAGS= $(LUA_LIBS)
 pdns_recursor_LDADD=
 
 pdns_control_SOURCES=dynloader.cc dynmessenger.cc  arguments.cc logger.cc statbag.cc \