Menu
▾
▴
[Wxlua-commit] wxLua/build/autoconf aclocal.m4, 1.57, 1.58 autoconf_inc.m4, 1.31, 1.32 configure.ac, 1.66, 1.67
|
From: John L. <jr...@us...> - 2008-01-19 21:37:43
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 configure.ac Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** autoconf_inc.m4 17 Jan 2008 00:37:37 -0000 1.31 --- autoconf_inc.m4 19 Jan 2008 21:37:09 -0000 1.32 *************** *** 69,72 **** --- 69,84 ---- fi AC_SUBST(COND_INSTALL_CUSTOM_WXBIND_1) + dnl ### begin block 20_COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### + COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1="#" + if test "x$MONOLITHIC_LUAMODULE" = "x0" -a "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then + COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1="" + fi + AC_SUBST(COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1) + dnl ### begin block 20_COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### + COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1="#" + if test "x$MONOLITHIC_LUAMODULE" = "x1" -a "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then + COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1="" + fi + AC_SUBST(COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1) dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#" *************** *** 207,216 **** fi AC_SUBST(COND_SHARED_1) - dnl ### begin block 20_COND_SHARED_1_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### - COND_SHARED_1_USE_LUAMODULE_1="#" - if test "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then - COND_SHARED_1_USE_LUAMODULE_1="" - fi - AC_SUBST(COND_SHARED_1_USE_LUAMODULE_1) dnl ### begin block 20_COND_SHARED_1_USE_SYSTEM_LUA_0[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1_USE_SYSTEM_LUA_0="#" --- 219,222 ---- Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** aclocal.m4 15 Jan 2008 20:19:55 -0000 1.57 --- aclocal.m4 19 Jan 2008 21:37:08 -0000 1.58 *************** *** 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.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** configure.ac 15 Jan 2008 20:19:55 -0000 1.66 --- configure.ac 19 Jan 2008 21:37:09 -0000 1.67 *************** *** 85,88 **** --- 85,91 ---- [AC_HELP_STRING([--enable-luamodule], [Compiles the lua module (default is yes)])], [], [enable_luamodule=yes]) + AC_ARG_ENABLE([monolithic_luamodule], + [AC_HELP_STRING([--enable-monolithic-luamodule], [Compile a monolithic lua module (default is no)])], + [], [enable_monolithic_luamodule=no]) AC_ARG_ENABLE([customwxbind-install], [AC_HELP_STRING([--enable-customwxbind-install], [Installs wxBind sources for custom builds (default is yes)])], *************** *** 118,124 **** UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDXRC], [enable_wxbindxrc], [--enable-wxbindxrc]) ! UTILS_YESNO_OPTCHECK([USE_WXLUADEBUG], [enable_wxluadebug], [--enable-wxluadebug]) ! UTILS_YESNO_OPTCHECK([USE_WXLUASOCKET], [enable_wxluasocket], [--enable-wxluasocket]) ! UTILS_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule], [--enable-luamodule]) UTILS_YESNO_OPTCHECK([INSTALL_CUSTOM_WXBIND], [enable_customwxbind_install], [--enable-customwxbind-install]) --- 121,128 ---- UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDXRC], [enable_wxbindxrc], [--enable-wxbindxrc]) ! UTILS_YESNO_OPTCHECK([USE_WXLUADEBUG], [enable_wxluadebug], [--enable-wxluadebug]) ! UTILS_YESNO_OPTCHECK([USE_WXLUASOCKET], [enable_wxluasocket], [--enable-wxluasocket]) ! UTILS_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule], [--enable-luamodule]) ! UTILS_YESNO_OPTCHECK([MONOLITHIC_LUAMODULE], [enable_monolithic_luamodule], [--enable-monolithic-luamodule]) UTILS_YESNO_OPTCHECK([INSTALL_CUSTOM_WXBIND], [enable_customwxbind_install], [--enable-customwxbind-install]) *************** *** 821,832 **** UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], ! [" - enable_wxluadebug module: yes"], ! [" - enable_wxluadebug module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUASOCKET], ! [" - enable_wxluasocket module: yes"], ! [" - enable_wxluasocket module: no"]) UTILS_BOOLOPT_SUMMARY([USE_LUAMODULE], ! [" - enable_luamodule module: yes"], ! [" - enable_luamodule module: no"]) # miscellaneous --- 825,839 ---- UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], ! [" - enable_wxluadebug module: yes"], ! [" - enable_wxluadebug module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUASOCKET], ! [" - enable_wxluasocket module: yes"], ! [" - enable_wxluasocket module: no"]) UTILS_BOOLOPT_SUMMARY([USE_LUAMODULE], ! [" - enable_luamodule module: yes"], ! [" - enable_luamodule module: no"]) ! UTILS_BOOLOPT_SUMMARY([MONOLITHIC_LUAMODULE], ! [" - enable_monolithic_luamodule module: yes"], ! [" - enable_monolithic_luamodule module: no"]) # miscellaneous |
