From: Francesco M. <fr...@us...> - 2006-05-20 13:12:50
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 Log Message: updated all build system trying to fix SHARED builds Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** autoconf_inc.m4 20 May 2006 12:16:53 -0000 1.17 --- autoconf_inc.m4 20 May 2006 13:12:34 -0000 1.18 *************** *** 79,83 **** fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then --- 79,83 ---- fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then *************** *** 127,130 **** --- 127,136 ---- 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_WXBINDSTC_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1_USE_WXBINDSTC_1="#" *************** *** 169,178 **** fi AC_SUBST(COND_USE_BIN2C_1) - dnl ### begin block 20_COND_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### - COND_USE_LUAMODULE_1="#" - if test "x$USE_LUAMODULE" = "x1" ; then - COND_USE_LUAMODULE_1="" - fi - AC_SUBST(COND_USE_LUAMODULE_1) dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOSYMLINKS_1="#" --- 175,178 ---- |