Menu
▾
▴
[Wxlua-commit] wxLua/build/autoconf aclocal.m4, 1.48, 1.49 configure.ac, 1.45, 1.46
|
From: Francesco M. <fr...@us...> - 2007-08-01 10:08:56
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207/build/autoconf Modified Files: aclocal.m4 configure.ac Log Message: fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** configure.ac 27 Jul 2007 01:11:10 -0000 1.45 --- configure.ac 1 Aug 2007 10:08:22 -0000 1.46 *************** *** 55,61 **** # Options for the MODULES section ! AC_ARG_ENABLE([wxbindstc], ! [AC_HELP_STRING([--enable-wxbindstc], [Compiles the wxLua bindings for STC (default is yes)])], ! [], [enable_wxbindstc=yes]) AC_ARG_ENABLE([wxluadebug], [AC_HELP_STRING([--enable-wxluadebug], [Compiles the wxLua debug support (default is yes)])], --- 55,82 ---- # Options for the MODULES section ! # NOTE: AC_BINDLIB_ENABLE saves us from some copy&paste ! AC_DEFUN([AC_BINDLIB_ENABLE], ! [ ! AC_ARG_ENABLE([$1], ! [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is yes)])], ! [], [enable_wxbind$1=yes; wxbind_list="$wxbind_list,$1"]) ! ]) ! ! AC_BINDLIB_ENABLE([adv], [wxAdvanced]) ! AC_BINDLIB_ENABLE([aui], [wxAUI]) ! AC_BINDLIB_ENABLE([base], [wxBase]) ! AC_BINDLIB_ENABLE([core], [wxCore]) ! AC_BINDLIB_ENABLE([gl], [wxGl]) ! AC_BINDLIB_ENABLE([html], [wxHTML]) ! AC_BINDLIB_ENABLE([media], [wxMedia]) ! AC_BINDLIB_ENABLE([net], [wxNet]) ! AC_BINDLIB_ENABLE([richtext], [wxRichText]) ! AC_BINDLIB_ENABLE([stc], [wxSTC]) ! AC_BINDLIB_ENABLE([xml], [wxXml]) ! AC_BINDLIB_ENABLE([xrc], [wxXRC]) ! ! # remove initial comma: ! wxbind_list=${wxbind_list:1} ! AC_ARG_ENABLE([wxluadebug], [AC_HELP_STRING([--enable-wxluadebug], [Compiles the wxLua debug support (default is yes)])], *************** *** 80,84 **** --- 101,117 ---- UTILS_YESNO_OPTCHECK([USE_WXLUAFREEZEAPP], [enable_wxluafreeze_app], [--enable-wxluafreeze-app]) + UTILS_YESNO_OPTCHECK([USE_WXBINDADV], [enable_wxbindadv], [--enable-wxbindadv]) + UTILS_YESNO_OPTCHECK([USE_WXBINDAUI], [enable_wxbindaui], [--enable-wxbindaui]) + UTILS_YESNO_OPTCHECK([USE_WXBINDBASE], [enable_wxbindbase], [--enable-wxbindbase]) + UTILS_YESNO_OPTCHECK([USE_WXBINDCORE], [enable_wxbindcore], [--enable-wxbindcore]) + UTILS_YESNO_OPTCHECK([USE_WXBINDGL], [enable_wxbindgl], [--enable-wxbindgl]) + UTILS_YESNO_OPTCHECK([USE_WXBINDHTML], [enable_wxbindhtml], [--enable-wxbindhtml]) + UTILS_YESNO_OPTCHECK([USE_WXBINDMEDIA], [enable_wxbindmedia], [--enable-wxbindmedia]) + UTILS_YESNO_OPTCHECK([USE_WXBINDNET], [enable_wxbindnet], [--enable-wxbindnet]) + UTILS_YESNO_OPTCHECK([USE_WXBINDRICHTEXT], [enable_wxbindrichtext], [--enable-wxbindrichtext]) UTILS_YESNO_OPTCHECK([USE_WXBINDSTC], [enable_wxbindstc], [--enable-wxbindstc]) + UTILS_YESNO_OPTCHECK([USE_WXBINDXML], [enable_wxbindxml], [--enable-wxbindxml]) + UTILS_YESNO_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]) *************** *** 126,130 **** AC_PROG_CXX ! WXLIBS_REQUIRED="xrc,html,adv,net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) --- 159,163 ---- AC_PROG_CXX ! WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) *************** *** 407,415 **** ]) AC_ADDMODULE([wxluasocket]) AC_ADDMODULE([wxluadebug]) AC_ADDMODULE([wxlua]) - AC_ADDMODULE([wxbind]) - AC_ADDMODULE([wxbindstc]) WXLUA_LIBNAMES="$WXLUA_LIBNAMES lua5.1" --- 440,459 ---- ]) + AC_ADDMODULE([wxbindadv]) + AC_ADDMODULE([wxbindaui]) + AC_ADDMODULE([wxbindbase]) + AC_ADDMODULE([wxbindcore]) + AC_ADDMODULE([wxbindgl]) + AC_ADDMODULE([wxbindhtml]) + AC_ADDMODULE([wxbindmedia]) + AC_ADDMODULE([wxbindnet]) + AC_ADDMODULE([wxbindrichtext]) + AC_ADDMODULE([wxbindstc]) + AC_ADDMODULE([wxbindxml]) + AC_ADDMODULE([wxbindxrc]) + AC_ADDMODULE([wxluasocket]) AC_ADDMODULE([wxluadebug]) AC_ADDMODULE([wxlua]) WXLUA_LIBNAMES="$WXLUA_LIBNAMES lua5.1" *************** *** 468,472 **** # declared as: # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> ! # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) macro must be used ! WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN --- 512,517 ---- # declared as: # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> ! # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) ! # macro must be used ! WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN *************** *** 500,503 **** --- 545,561 ---- [" - wxBindSTC module: yes"], [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], + [" - wxBindSTC module: yes"], + [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], + [" - wxBindSTC module: yes"], + [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], + [" - wxBindSTC module: yes"], + [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], + [" - wxBindSTC module: yes"], + [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], [" - wxLuaDebug module: yes"], *************** *** 516,519 **** --- 574,580 ---- [" - install custom wxBind stuff: no"]) + echo " - wxBind modules activated: " + echo " $wxbind_list" + WX_STANDARD_OPTIONS_SUMMARY_MSG_END |
