diff --git a/Makefile.am b/Makefile.am index ead17433..ed215524 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = include src bindings examples tests +SUBDIRS = include src examples tests EXTRA_DIST=\ CMakeLists.txt \ diff --git a/configure.ac b/configure.ac index 0c6424a4..54ae61e8 100644 --- a/configure.ac +++ b/configure.ac @@ -108,34 +108,6 @@ AS_IF([test "x$with_valgrind" != xno], ]) AM_CONDITIONAL(USE_VALGRIND, test "x$VALGRIND" != x) -dnl Check for lua -AC_MSG_CHECKING(if with lua) -AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[lua]), -[WITH_LUA=$withval],[WITH_LUA=yes]) - -if test "$WITH_LUA" != "no"; then - AC_MSG_RESULT($WITH_LUA) - # 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]) - ]) - ]) - - AC_SUBST(LUA_CFLAGS) - AC_SUBST(LUA_LIBS) -fi - AC_CONFIG_FILES([ Makefile include/Makefile