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

[julio (none)]

The following commit has been merged in the master branch:
commit 57ccdaddbb2d8c36bd5b7b0afcb2fb2032d3d5c5
Author: julio <julio at filipovna.(none)>
Date:   Fri Jul 23 07:35:43 2010 -0500

    Adding Lua suport to configure.ac

diff --git a/configure.ac b/configure.ac
index 6f869cc..c5894fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,32 @@ AC_DEFINE([HAVE_LIBMXML],[1],[Define to 1 if you have the `mxml` library])
 CFLAGS="$CFLAGS $MXML_CFLAGS"
 LIBS="$LIBS $MXML_LIBS"
 
+dnl Check for (somewhat) higher-level math functions - needed for SDL_extras
+AC_CHECK_LIB([m],
+              [csin],
+              ,
+              [AC_MSG_ERROR([Math library not found - functions in <math.h> may not be available.])])
+
+dnl Check for LibLua: --------------------------------------------------------
+
+PKG_CHECK_MODULES([LUA],
+    [lua],
+    ,
+    [
+      [echo "LUA not found via pkg_config, checking with AC_CHECK_LIB:"]
+	AC_CHECK_LIB(lua50, lua_open, [
+           LUA_LIBS="-llualin50 -llua50"
+           ],[AC_MSG_ERROR([LUA not found! http://www.lua.org])])
+
+      [echo "LUA successfully located"]
+    ] 
+)
+
+AC_DEFINE([HAVE_LIBLUA],[1],[Define to 1 if you have the `lua` library])
+CFLAGS="$CFLAGS $LUA_CFLAGS"
+LIBS="$LIBS $LUA_LIBS"
+
+
 
 
 dnl Check for SDL_Pango: --------------------------------------------------------
@@ -255,11 +281,6 @@ if test "x$with_rsvg" = xyes; then
   AC_DEFINE([HAVE_RSVG],[1],[Define to 1 if you have the `libRSVG` library])
 fi
 
-dnl Check for (somewhat) higher-level math functions - needed for SDL_extras
-AC_CHECK_LIB([m],
-              [csin],
-              ,
-              [AC_MSG_ERROR([Math library not found - functions in <math.h> may not be available.])])
 
 
 
@@ -272,7 +293,7 @@ AC_ARG_WITH([sdlnet],
 	    [AS_HELP_STRING([--without-sdlnet],
 	    [Do not use SDL_net even if available])],
 	    [],
-	    [with_sdlnet=yes]
+	    [with_sdlnet=no]
 )
 
 if test "x$with_sdlnet" != xno; then

-- 
tuxhistory - Educational history game