[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. aabc02c971b6dd216af10a04a9c9659af19e2a74

[Aviral Dasgupta]

The following commit has been merged in the master branch:
commit aabc02c971b6dd216af10a04a9c9659af19e2a74
Author: Aviral Dasgupta <aviraldg at gmail.com>
Date:   Mon Dec 6 01:55:34 2010 +0000

    Added new lua header detection system to configure.ac

diff --git a/configure.ac b/configure.ac
index 19fc53e..cbc3945 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,23 +180,13 @@ AC_CHECK_LIB([m],
 
 dnl Check for LibLua: --------------------------------------------------------
 
-PKG_CHECK_MODULES([LUA],
-    [lua50],
-    ,
-    [
-      [echo "LUA not found via pkg_config, checking with AC_CHECK_LIB:"]
-	AC_CHECK_LIB(lua50, lua_open, [
-           LUA_LIBS="-llua50"
-           ],[AC_MSG_ERROR([LUA not found! http://www.lua.org])])
-
-      [echo "LUA successfully located"]
-    ] 
-)
+AX_LUA_HEADERS_VERSION(500)
+AX_LUA_LIBS()
+AX_LUA_HEADERS()
 
 AC_DEFINE([HAVE_LIBLUA],[1],[Define to 1 if you have the `lua` library])
-CFLAGS="$CFLAGS $LUA_CFLAGS"
-LIBS="$LIBS $LUA_LIBS"
-
+CFLAGS="$CFLAGS $LUA_INCLUDE"
+LIBS="$LIBS $LUA_LIB"
 
 dnl Check for SDL_Pango: --------------------------------------------------------
 

-- 
tuxhistory - Educational history game