Index: configure.in
===================================================================
--- configure.in	(revision 589)
+++ configure.in	(working copy)
@@ -301,14 +301,23 @@
 AC_MSG_CHECKING(for lua)
 AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[lua engine for mod_cml]),
 [AC_MSG_RESULT(yes)
- AC_CHECK_LIB(lua, lua_open, [
-         AC_CHECK_HEADERS([lua.h],[
-	         LUA_LIB="-llua -llualib -lm"
-                 AC_DEFINE([HAVE_LUA], [1], [liblua])
-		 AC_DEFINE([HAVE_LUA_H], [1])
-         ])
- ])
+ AC_PATH_PROG(LUACONFIG, lua-config)
+ if test x"$LUACONFIG" != x; then
+   LUA_CFLAGS=`$LUACONFIG --include`
+   LUA_LIB=`$LUACONFIG --libs --extralibs`
+   OLDCPPFLAGS="$CPPFLAGS"
+   OLDLIBS="$LIBS"
+   CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"
+   LIBS="$LIBS $LUA_LIB"
+   AC_LINK_IFELSE([AC_LANG_CALL([], [lua_open])], [], [
+     LUA_CFLAGS=""
+     LUA_LIB=""
+   ])
+   CPPFLAGS="$OLDCPPFLAGS"
+   LIBS="$OLDLIBS"
+ fi
 ],[AC_MSG_RESULT(no)])
+AC_SUBST(LUA_CFLAGS)
 AC_SUBST(LUA_LIB)
 
 
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 589)
+++ src/Makefile.am	(working copy)
@@ -75,6 +75,7 @@
 
 lib_LTLIBRARIES += mod_cml.la
 mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c
+mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
 mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIB)