From: Francesco M. <fr...@us...> - 2006-02-03 18:41:04
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289/build/autoconf Modified Files: autoconf_inc.m4 configure.ac Log Message: added wxluacan sample to build system Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** autoconf_inc.m4 3 Feb 2006 17:06:15 -0000 1.5 --- autoconf_inc.m4 3 Feb 2006 18:40:50 -0000 1.6 *************** *** 49,70 **** fi AC_SUBST(COND_PLATFORM_MAC_1) ! dnl ### begin block 20_COND_PLATFORM_OS2_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_OS2_1="#" ! if test "x$PLATFORM_OS2" = "x1" ; then ! COND_PLATFORM_OS2_1="" ! fi ! AC_SUBST(COND_PLATFORM_OS2_1) ! dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_PLATFORM_WIN32_1="#" ! if test "x$PLATFORM_WIN32" = "x1" ; then ! COND_PLATFORM_WIN32_1="" ! fi ! AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_USE_APPS_1[./wxlua.bkl] ### ! COND_USE_APPS_1="#" ! if test "x$USE_APPS" = "x1" ; then ! COND_USE_APPS_1="" ! fi ! AC_SUBST(COND_USE_APPS_1) dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### COND_USE_BIN2C_1="#" --- 49,70 ---- fi AC_SUBST(COND_PLATFORM_MAC_1) ! dnl ### begin block 20_COND_PLATFORM_OS2_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_OS2_1="#" ! if test "x$PLATFORM_OS2" = "x1" ; then ! COND_PLATFORM_OS2_1="" ! fi ! AC_SUBST(COND_PLATFORM_OS2_1) ! dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_PLATFORM_WIN32_1="#" ! if test "x$PLATFORM_WIN32" = "x1" ; then ! COND_PLATFORM_WIN32_1="" ! fi ! AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_USE_APPS_1[./wxlua.bkl] ### ! COND_USE_APPS_1="#" ! if test "x$USE_APPS" = "x1" ; then ! COND_USE_APPS_1="" ! fi ! AC_SUBST(COND_USE_APPS_1) dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### COND_USE_BIN2C_1="#" *************** *** 103,124 **** fi AC_SUBST(COND_USE_SOVERSOLARIS_1) ! dnl ### begin block 20_COND_USE_UTIL_1[./wxlua.bkl] ### ! COND_USE_UTIL_1="#" ! if test "x$USE_UTIL" = "x1" ; then ! COND_USE_UTIL_1="" ! fi ! AC_SUBST(COND_USE_UTIL_1) ! dnl ### begin block 20_COND_USE_WXLUAAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAAPP_1="#" ! if test "x$USE_WXLUAAPP" = "x1" ; then ! COND_USE_WXLUAAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAAPP_1) ! dnl ### begin block 20_COND_USE_WXLUAEDITAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAEDITAPP_1="#" ! if test "x$USE_WXLUAEDITAPP" = "x1" ; then ! COND_USE_WXLUAEDITAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAEDITAPP_1) dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../modules/build/bakefiles/modules.bkl] ### COND_WINDOWS_IMPLIB_1="#" --- 103,130 ---- fi AC_SUBST(COND_USE_SOVERSOLARIS_1) ! dnl ### begin block 20_COND_USE_UTIL_1[./wxlua.bkl] ### ! COND_USE_UTIL_1="#" ! if test "x$USE_UTIL" = "x1" ; then ! COND_USE_UTIL_1="" ! fi ! AC_SUBST(COND_USE_UTIL_1) ! dnl ### begin block 20_COND_USE_WXLUAAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAAPP_1="#" ! if test "x$USE_WXLUAAPP" = "x1" ; then ! COND_USE_WXLUAAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAAPP_1) ! dnl ### begin block 20_COND_USE_WXLUACANAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUACANAPP_1="#" ! if test "x$USE_WXLUACANAPP" = "x1" ; then ! COND_USE_WXLUACANAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUACANAPP_1) ! dnl ### begin block 20_COND_USE_WXLUAEDITAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAEDITAPP_1="#" ! if test "x$USE_WXLUAEDITAPP" = "x1" ; then ! COND_USE_WXLUAEDITAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAEDITAPP_1) dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../modules/build/bakefiles/modules.bkl] ### COND_WINDOWS_IMPLIB_1="#" Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.ac 2 Feb 2006 23:02:28 -0000 1.8 --- configure.ac 3 Feb 2006 18:40:50 -0000 1.9 *************** *** 32,35 **** --- 32,38 ---- [AC_HELP_STRING([--enable-wxlua-app], [Compiles the wxLua app (default is yes)])], [], [enable_wxlua_app=yes]) + AC_ARG_ENABLE([wxluacan-app], + [AC_HELP_STRING([--enable-wxluacan-app], [Compiles the wxLuaCan app (default is yes)])], + [], [enable_wxluacan_app=yes]) AC_ARG_ENABLE([wxluaedit-app], [AC_HELP_STRING([--enable-wxluaedit-app], [Compiles the wxLuaEditor app (default is no)])], *************** *** 55,58 **** --- 58,62 ---- AM_YESNO_OPTCHECK([USE_WXLUAAPP], [enable_wxlua_app], [--enable-wxlua-app]) + AM_YESNO_OPTCHECK([USE_WXLUACANAPP], [enable_wxluacan_app], [--enable-wxluacan-app]) AM_YESNO_OPTCHECK([USE_WXLUAEDITAPP], [enable_wxluaedit_app], [--enable-wxluaedit-app]) *************** *** 129,132 **** --- 133,141 ---- echo " - wxLua application DISABLED" fi + if [[ "$USE_WXLUACANAPP" = "1" ]]; then + echo " - wxLuaCan application ENABLED" + else + echo " - wxLuaCan application DISABLED" + fi if [[ "$USE_WXLUAEDITAPP" = "1" ]]; then echo " - wxLuaEdit application ENABLED" |