From: John L. <jr...@us...> - 2008-01-16 19:54:58
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/build/autoconf Modified Files: autoconf_inc.m4 Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** autoconf_inc.m4 15 Jan 2008 20:19:55 -0000 1.29 --- autoconf_inc.m4 16 Jan 2008 19:54:22 -0000 1.30 *************** *** 351,354 **** --- 351,414 ---- fi AC_SUBST(COND_USE_SYSTEM_LUA_0) + dnl ### begin block 20_COND_USE_WXBINDADV_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDADV_0="#" + if test "x$USE_WXBINDADV" = "x0" ; then + COND_USE_WXBINDADV_0="" + fi + AC_SUBST(COND_USE_WXBINDADV_0) + dnl ### begin block 20_COND_USE_WXBINDAUI_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDAUI_0="#" + if test "x$USE_WXBINDAUI" = "x0" ; then + COND_USE_WXBINDAUI_0="" + fi + AC_SUBST(COND_USE_WXBINDAUI_0) + dnl ### begin block 20_COND_USE_WXBINDBASE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDBASE_0="#" + if test "x$USE_WXBINDBASE" = "x0" ; then + COND_USE_WXBINDBASE_0="" + fi + AC_SUBST(COND_USE_WXBINDBASE_0) + dnl ### begin block 20_COND_USE_WXBINDCORE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDCORE_0="#" + if test "x$USE_WXBINDCORE" = "x0" ; then + COND_USE_WXBINDCORE_0="" + fi + AC_SUBST(COND_USE_WXBINDCORE_0) + dnl ### begin block 20_COND_USE_WXBINDGL_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDGL_0="#" + if test "x$USE_WXBINDGL" = "x0" ; then + COND_USE_WXBINDGL_0="" + fi + AC_SUBST(COND_USE_WXBINDGL_0) + dnl ### begin block 20_COND_USE_WXBINDHTML_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDHTML_0="#" + if test "x$USE_WXBINDHTML" = "x0" ; then + COND_USE_WXBINDHTML_0="" + fi + AC_SUBST(COND_USE_WXBINDHTML_0) + dnl ### begin block 20_COND_USE_WXBINDMEDIA_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDMEDIA_0="#" + if test "x$USE_WXBINDMEDIA" = "x0" ; then + COND_USE_WXBINDMEDIA_0="" + fi + AC_SUBST(COND_USE_WXBINDMEDIA_0) + dnl ### begin block 20_COND_USE_WXBINDNET_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDNET_0="#" + if test "x$USE_WXBINDNET" = "x0" ; then + COND_USE_WXBINDNET_0="" + fi + AC_SUBST(COND_USE_WXBINDNET_0) + dnl ### begin block 20_COND_USE_WXBINDRICHTEXT_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDRICHTEXT_0="#" + if test "x$USE_WXBINDRICHTEXT" = "x0" ; then + COND_USE_WXBINDRICHTEXT_0="" + fi + AC_SUBST(COND_USE_WXBINDRICHTEXT_0) + dnl ### begin block 20_COND_USE_WXBINDSTC_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDSTC_0="#" + if test "x$USE_WXBINDSTC" = "x0" ; then + COND_USE_WXBINDSTC_0="" + fi + AC_SUBST(COND_USE_WXBINDSTC_0) dnl ### begin block 20_COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1[../../apps/build/bakefiles/apps.bkl] ### COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1="#" *************** *** 363,366 **** --- 423,438 ---- fi AC_SUBST(COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1) + dnl ### begin block 20_COND_USE_WXBINDXML_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDXML_0="#" + if test "x$USE_WXBINDXML" = "x0" ; then + COND_USE_WXBINDXML_0="" + fi + AC_SUBST(COND_USE_WXBINDXML_0) + dnl ### begin block 20_COND_USE_WXBINDXRC_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDXRC_0="#" + if test "x$USE_WXBINDXRC" = "x0" ; then + COND_USE_WXBINDXRC_0="" + fi + AC_SUBST(COND_USE_WXBINDXRC_0) dnl ### begin block 20_COND_USE_WXLUACANAPP_1[../../apps/build/bakefiles/apps.bkl] ### COND_USE_WXLUACANAPP_1="#" |