From 82ec5be065537a7ace5d7603b0c4e25c51da6109 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 29 Sep 2010 16:09:26 +0000
Subject: [PATCH] =?UTF-8?q?Assume=20that=20any=20user-provided=20liblua=20?=
 =?UTF-8?q?is=20recent=20enough=20when=20cross-compiling.=20That=20this=20?=
 =?UTF-8?q?was=20a=20problem=20was=20reported=20by=20Nuno=20Gon=C3=A7alves?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configure    | 6 ++----
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index e79c33ff1..ade77a1de 100755
--- a/configure
+++ b/configure
@@ -6695,10 +6695,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 $as_echo_n "checking for lua version >= 501... " >&6; }
 
 if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling -- assuming yes" >&5
+$as_echo "cross-compiling -- assuming yes" >&6; }; have_lua=yes
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/configure.ac b/configure.ac
index 7a5115fc7..22a0349b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,7 +603,7 @@ else
     AC_RUN_IFELSE([ AC_LANG_PROGRAM(
     	[[#include <lua.h>]], 
     	[[if(LUA_VERSION_NUM < 501) return 1;]])], 
-    	have_lua=yes, have_lua=no)
+    	have_lua=yes, have_lua=no, AC_MSG_RESULT(cross-compiling -- assuming yes); have_lua=yes)
     AC_LANG_POP(C++)
   
     LUA_DEPENDS=""