Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10474/wxLua/build/autoconf
Modified Files:
aclocal.m4 configure.ac
Log Message:
Add --enable-systemlua=yes/no/auto and have a better check for a system Lua.
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** aclocal.m4 14 Jan 2008 12:13:33 -0000 1.53
--- aclocal.m4 14 Jan 2008 17:11:10 -0000 1.54
***************
*** 1,6 ****
! # generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
! # 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! # generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
! # 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** configure.ac 14 Jan 2008 13:21:55 -0000 1.56
--- configure.ac 14 Jan 2008 17:11:10 -0000 1.57
***************
*** 92,95 ****
--- 92,98 ----
[], [enable_customwxbind_install=yes])
+ AC_ARG_ENABLE([systemlua],
+ [AC_HELP_STRING([--enable-systemlua], [Use the system Lua (default is auto)])],
+ [], [enable_systemlua=auto])
AC_ARG_WITH([lua-prefix],
[AC_HELP_STRING([--with-lua-prefix], [Prefix where Lua is installed (optional)])],
***************
*** 200,207 ****
# exist then we use our built-in lua
! if test "$lua_dir" = ""; then
UTILS_SAVE_COREVAR()
LIBS="$LIBS -llua5.1"
AC_LINK_IFELSE([
--- 203,219 ----
# exist then we use our built-in lua
! AC_MSG_CHECKING([if Lua 5.1 is installed])
!
! if test ! "$enable_systemlua" = "no"; then
UTILS_SAVE_COREVAR()
+ # force C compilation, not C++
+ CPPFLAGS="-x c $CPPFLAGS"
+
+ # use their Lua path --with-lua-prefix=$lua_dir
+ if test ! "$lua_dir" = ""; then
+ CPPFLAGS="-I$lua_dir $CPPFLAGS"
+ fi
LIBS="$LIBS -llua5.1"
AC_LINK_IFELSE([
***************
*** 215,221 ****
# from other macros called by AC_LINK_IFELSE may interfere
# in the final output
- AC_MSG_CHECKING([if Lua 5.1 is installed])
if test "$LUA_PRESENCE" = "1"; then
! AC_MSG_RESULT([yes])
USE_SYSTEM_LUA=1
else
--- 227,232 ----
# from other macros called by AC_LINK_IFELSE may interfere
# in the final output
if test "$LUA_PRESENCE" = "1"; then
! AC_MSG_RESULT([yes, using system Lua])
USE_SYSTEM_LUA=1
else
***************
*** 223,226 ****
--- 234,244 ----
USE_SYSTEM_LUA=0
+ if test "$enable_systemlua" = "yes"; then
+ AC_MSG_ERROR([
+ You specified --enable-systemlua=yes, but it is not useable. See config.log.
+ ])
+
+ fi
+
# LUA_DIR must always be an absolute path!
LUA_DIR="`pwd`/$srcdir/modules/lua"
***************
*** 231,237 ****
else
!
! USE_SYSTEM_LUA=1
! LUA_DIR="$lua_dir"
fi
--- 249,255 ----
else
! AC_MSG_RESULT([using built-in Lua --enable-systemlua=no])
! USE_SYSTEM_LUA=0
! LUA_DIR="`pwd`/$srcdir/modules/lua"
fi
|
