Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26453/wxLua/build/autoconf
Modified Files:
aclocal.m4 configure.ac
Log Message:
Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so
a system Lua's include path can be specified exactly.
Used bakefile-0.2.3
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** aclocal.m4 15 Jan 2008 00:04:58 -0000 1.55
--- aclocal.m4 15 Jan 2008 18:37:27 -0000 1.56
***************
*** 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.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** configure.ac 15 Jan 2008 00:00:21 -0000 1.63
--- configure.ac 15 Jan 2008 18:37:27 -0000 1.64
***************
*** 208,211 ****
--- 208,212 ----
AC_MSG_CHECKING([if Lua 5.1 is installed])
+ USE_SYSTEM_LUA=0
if test ! "$enable_systemlua" = "no"; then
***************
*** 234,240 ****
AC_MSG_RESULT([yes, using system Lua])
USE_SYSTEM_LUA=1
else
AC_MSG_RESULT([not found, falling back to the built-in lua])
- USE_SYSTEM_LUA=0
if test "$enable_systemlua" = "yes"; then
--- 235,247 ----
AC_MSG_RESULT([yes, using system Lua])
USE_SYSTEM_LUA=1
+ if test ! $lua_dir = ""; then
+ LUA_INCLUDE_DIR=$lua_dir
+ # We don't know where the system LUA_LIB_DIR is, just duplicate our lib path
+ LUA_LIB_DIR="`pwd`/lib"
+ echo " Lua include path: '$LUA_INCLUDE_DIR'"
+ fi
+
else
AC_MSG_RESULT([not found, falling back to the built-in lua])
if test "$enable_systemlua" = "yes"; then
***************
*** 244,264 ****
fi
-
- # LUA_DIR must always be an absolute path!
- LUA_DIR="`pwd`/$srcdir/modules/lua"
- AC_SUBST([LUA_DIR])
fi
! UTILS_RESTORE_COREVAR() # remove the -llua5.1 piece from $LIBS
else
AC_MSG_RESULT([using built-in Lua --enable-systemlua=no])
- USE_SYSTEM_LUA=0
- LUA_DIR="`pwd`/$srcdir/modules/lua"
fi
if test "$USE_SYSTEM_LUA" = "0"; then
# Checks used to determine right LUA flags (see modules/lua/src/Makefile)
luadefs=
--- 251,271 ----
fi
fi
! UTILS_RESTORE_COREVAR() # restore $CPPFLAGS and $LIBS
else
AC_MSG_RESULT([using built-in Lua --enable-systemlua=no])
fi
+ AC_SUBST([LUA_INCLUDE_DIR])
+ AC_SUBST([LUA_LIB_DIR])
if test "$USE_SYSTEM_LUA" = "0"; then
+ # LUA_INCLUDE_DIR must always be an absolute path!
+ LUA_INCLUDE_DIR="`pwd`/$srcdir/modules/lua/include"
+ LUA_LIB_DIR="`pwd`/lib"
+
# Checks used to determine right LUA flags (see modules/lua/src/Makefile)
luadefs=
***************
*** 287,291 ****
AC_SUBST(LUA_PLATFORM_SPECIFIC_CFLAGS)
AC_SUBST(LUA_PLATFORM_SPECIFIC_LDFLAGS)
-
fi
--- 294,297 ----
***************
*** 555,563 ****
if test ! "$wxstedit_dir" = ""; then
WXSTEDIT=$wxstedit_dir
! echo "Path to wxStEdit from --with-wxstedit-dir: '$WXSTEDIT'"
else
# Try to get the wxStEdit src dir from the shell environment variable
WXSTEDIT=`echo $WXSTEDIT`
! echo "Path to wxStEdit from \$WXSTEDIT environment variable: '$WXSTEDIT'"
fi
--- 561,569 ----
if test ! "$wxstedit_dir" = ""; then
WXSTEDIT=$wxstedit_dir
! echo " wxStEdit include path from --with-wxstedit-dir: '$WXSTEDIT'"
else
# Try to get the wxStEdit src dir from the shell environment variable
WXSTEDIT=`echo $WXSTEDIT`
! echo " wxStEdit include path from \$WXSTEDIT environment variable: '$WXSTEDIT'"
fi
|
