diff --git a/auxdir/x_ac_lua.m4 b/auxdir/x_ac_lua.m4
index 2e9ca2bfe2cbc2ad4d8630a041808d52769eae38..d4033afb0a6a2489284c39bbdf69cb811981f86b 100644
--- a/auxdir/x_ac_lua.m4
+++ b/auxdir/x_ac_lua.m4
@@ -19,13 +19,26 @@ AC_DEFUN([X_AC_LUA],
 	PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
                 [x_ac_have_lua="yes"],
                 [x_ac_have_lua="no"])
-	
-	if test "x$x_ac_have_lua" = "xyes"; then
-		x_ac_lua_saved_LIBS="$LIBS"
-		AC_SEARCH_LIBS([luaL_newstate], [lua lua5.1],
-                        [x_ac_have_lua="yes"],
-                        [x_ac_have_lua="no"])
-		LIBS="$x_ac_lua_saved_LIBS"
-	fi
+
+	if test x"$x_ac_have_lua" = "xyes"; then
+	  saved_CFLAGS="$CFLAGS"
+	  saved_LDFLAGS="$LDFLAGS"
+	  CFLAGS="$CFLAGS $lua_CFLAGS"
+	  LDFLAGS="$LDFLAGS $lua_LIBS"
+	  AC_MSG_CHECKING([for whether we can link to liblua])
+	  AC_TRY_LINK(
+		[#include <lua.h>
+         #include <lauxlib.h>
+		 #include <lualib.h>
+		],
+		[lua_State *L = luaL_newstate ();
+		],
+		[], [x_ac_have_lua="no"])
+
+	  AC_MSG_RESULT([$x_ac_have_lua])
+	  CFLAGS="$saved_CFLAGS"
+	  LDFLAGS="$saved_LDFLAGS"
+     fi
+
 	AM_CONDITIONAL(HAVE_LUA, test "x$x_ac_have_lua" = "xyes")
 ])
diff --git a/configure b/configure
index 9371c54e5a17e66a41f7a7e602d48679fd79c2da..e9c59e5dbea613e41ecc35b0b92157001af8649a 100755
--- a/configure
+++ b/configure
@@ -19556,68 +19556,42 @@ $as_echo "yes" >&6; }
 	x_ac_have_lua="yes"
 fi
 
-	if test "x$x_ac_have_lua" = "xyes"; then
-		x_ac_lua_saved_LIBS="$LIBS"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing luaL_newstate" >&5
-$as_echo_n "checking for library containing luaL_newstate... " >&6; }
-if test "${ac_cv_search_luaL_newstate+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	if test x"$x_ac_have_lua" = "xyes"; then
+	  saved_CFLAGS="$CFLAGS"
+	  saved_LDFLAGS="$LDFLAGS"
+	  CFLAGS="$CFLAGS $lua_CFLAGS"
+	  LDFLAGS="$LDFLAGS $lua_LIBS"
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether we can link to liblua" >&5
+$as_echo_n "checking for whether we can link to liblua... " >&6; }
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <lua.h>
+         #include <lauxlib.h>
+		 #include <lualib.h>
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char luaL_newstate ();
 int
 main ()
 {
-return luaL_newstate ();
+lua_State *L = luaL_newstate ();
+
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' lua lua5.1; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_luaL_newstate=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if test "${ac_cv_search_luaL_newstate+set}" = set; then :
-  break
-fi
-done
-if test "${ac_cv_search_luaL_newstate+set}" = set; then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-else
-  ac_cv_search_luaL_newstate=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_luaL_newstate" >&5
-$as_echo "$ac_cv_search_luaL_newstate" >&6; }
-ac_res=$ac_cv_search_luaL_newstate
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  x_ac_have_lua="yes"
 else
   x_ac_have_lua="no"
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $x_ac_have_lua" >&5
+$as_echo "$x_ac_have_lua" >&6; }
+	  CFLAGS="$saved_CFLAGS"
+	  LDFLAGS="$saved_LDFLAGS"
+     fi
 
-		LIBS="$x_ac_lua_saved_LIBS"
-	fi
 	 if test "x$x_ac_have_lua" = "xyes"; then
   HAVE_LUA_TRUE=
   HAVE_LUA_FALSE='#'