From: Francesco M. <fr...@us...> - 2008-01-15 20:19:59
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2609 Modified Files: configure Log Message: don't build lua interpreter and lua compiler if using system lua Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** configure 15 Jan 2008 19:45:27 -0000 1.76 --- configure 15 Jan 2008 20:19:55 -0000 1.77 *************** *** 811,814 **** --- 811,815 ---- COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 + COND_USE_SYSTEM_LUA_0 COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1 COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1 *************** *** 1934,1937 **** --- 1935,1943 ---- + # same as UTILS_BOOLOPT_SUMMARY but takes 2 bool options + + + + *************** *** 13406,13409 **** --- 13412,13420 ---- fi + COND_USE_SYSTEM_LUA_0="#" + if test "x$USE_SYSTEM_LUA" = "x0" ; then + COND_USE_SYSTEM_LUA_0="" + fi + COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1="#" if test "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ; then *************** *** 14385,14388 **** --- 14396,14400 ---- COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim + COND_USE_SYSTEM_LUA_0!$COND_USE_SYSTEM_LUA_0$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1!$COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1!$COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1$ac_delim *************** *** 14394,14398 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then break elif $ac_last_try; then --- 14406,14410 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then break elif $ac_last_try; then *************** *** 14774,14777 **** --- 14786,14807 ---- echo + if [ "x$USE_SYSTEM_LUA" = "x0" ]; then + echo " - Lua interpreter: yes" + elif [ "x$USE_SYSTEM_LUA" = "x1" ]; then + echo " - Lua interpreter: no" + else + echo "USE_SYSTEM_LUA is $USE_SYSTEM_LUA" + fi + + + if [ "x$SHARED" = "x0" -a "x$USE_SYSTEM_LUA" = "x0" ]; then + echo " - Lua compiler: yes" + elif [ "x$SHARED" = "x1" -o "x$USE_SYSTEM_LUA" = "x1" ]; then + echo " - Lua compiler: no" + else + echo "SHARED is $SHARED; USE_SYSTEM_LUA is $USE_SYSTEM_LUA" + fi + + if [ "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ]; then echo " - wxLua application: yes" |