--- configure.orig	2008-03-15 02:21:22.000000000 +0100
+++ configure	2008-04-13 17:16:35.000000000 +0200
@@ -1929,7 +1929,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+set dummy ${ac_tool_prefix}$CXX; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
@@ -7174,9 +7174,10 @@
     no_lua="yes"
   ;;
   *)
-    CXXFLAGS="-I$with_liblua/include $CXXFLAGS"
-    LDFLAGS="-L$with_liblua/lib $LDFLAGS"
+    CXXFLAGS="-I${LUA_INCDIR} $CXXFLAGS"
+    LDFLAGS="-L${LUA_LIBDIR} $LDFLAGS"
     have_lua=yes
+    LIBLUA_LIBS="-llua"
   ;;
   esac