Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: Francesco M. <fr...@us...> - 2008-01-14 13:22:46
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19135 Modified Files: configure Log Message: regenerated configure after wxwin.m4 changes Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** configure 14 Jan 2008 12:13:32 -0000 1.66 --- configure 14 Jan 2008 13:22:38 -0000 1.67 *************** *** 674,678 **** CXXFLAGS ac_ct_CXX - WXLIBS_REQUIRED WX_CONFIG_PATH WX_CPPFLAGS --- 674,677 ---- *************** *** 2852,2855 **** --- 2851,2855 ---- WXLIB_NAMES="core,base" + # Initial list of wxLua libraries WXLUA_LIBS="-llua5.1" *************** *** 4269,4277 **** - #WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base" FIXME should also check for net and xml - WXLIBS_REQUIRED="net,xml,core,base" - - # standard wxWidgets checks: if test "$WX_SHARED" = "1" ; then --- 4269,4277 ---- # standard wxWidgets checks: + # NOTE: the 'core,base' string passed to WX_CONFIG_CHECK macro here + # is just a fake list of the required wxWidgets libraries. + # Later we'll check for the existence of each wxWidgets library + # and then we'll rebuild the WX_LIBS string if test "$WX_SHARED" = "1" ; then *************** *** 4432,4440 **** { echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 echo "${ECHO_T}yes (version $WX_VERSION)" >&6; } ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIBS_REQUIRED` { echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6; } ! WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $WXLIBS_REQUIRED 2>/dev/null` if test "x$WX_LIBS_STATIC" = "x"; then { echo "$as_me:$LINENO: result: no" >&5 --- 4432,4440 ---- { echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 echo "${ECHO_T}yes (version $WX_VERSION)" >&6; } ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs core,base` { echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6; } ! WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs core,base 2>/dev/null` if test "x$WX_LIBS_STATIC" = "x"; then { echo "$as_me:$LINENO: result: no" >&5 *************** *** 4479,4483 **** if test "x$wx_has_cppflags" = x ; then ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $WXLIBS_REQUIRED` WX_CPPFLAGS=$WX_CFLAGS WX_CXXFLAGS=$WX_CFLAGS --- 4479,4483 ---- if test "x$wx_has_cppflags" = x ; then ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags core,base` WX_CPPFLAGS=$WX_CFLAGS WX_CXXFLAGS=$WX_CFLAGS *************** *** 4486,4492 **** WX_CXXFLAGS_ONLY=$WX_CFLAGS else ! WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $WXLIBS_REQUIRED` ! WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $WXLIBS_REQUIRED` ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $WXLIBS_REQUIRED` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` --- 4486,4492 ---- WX_CXXFLAGS_ONLY=$WX_CFLAGS else ! WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags core,base` ! WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags core,base` ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags core,base` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` *************** *** 4769,4778 **** if test "$DEBUG" = "auto"; then DEBUG=$WX_DEBUG - - if test "$DEBUG" = "1"; then - BUILD="debug" - elif test "$DEBUG" = ""; then - BUILD="release" - fi fi if test "$UNICODE" = "auto"; then --- 4769,4772 ---- *************** *** 4786,4789 **** --- 4780,4789 ---- fi + if test "$DEBUG" = "1"; then + BUILD="debug" + elif test "$DEBUG" = ""; then + BUILD="release" + fi + if test "$DEBUG" = "1"; then CXXFLAGS="$CXXFLAGS -g -O0" *************** *** 6185,6190 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs adv,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets adv bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets adv bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6185,6190 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs adv,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets adv library is available" >&5 ! echo $ECHO_N "checking if wxWidgets adv library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 6276,6281 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs aui,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets aui bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets aui bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6276,6281 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs aui,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets aui library is available" >&5 ! echo $ECHO_N "checking if wxWidgets aui library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 6367,6372 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs gl,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets gl bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets gl bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6367,6372 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs gl,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets gl library is available" >&5 ! echo $ECHO_N "checking if wxWidgets gl library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 6458,6463 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs html,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets html bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets html bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6458,6463 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs html,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets html library is available" >&5 ! echo $ECHO_N "checking if wxWidgets html library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 6549,6554 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs media,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets media bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets media bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6549,6554 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs media,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets media library is available" >&5 ! echo $ECHO_N "checking if wxWidgets media library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 6640,6645 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs net,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets net bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets net bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6640,6645 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs net,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets net library is available" >&5 ! echo $ECHO_N "checking if wxWidgets net library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 6731,6736 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xml,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets xml bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets xml bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6731,6736 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xml,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets xml library is available" >&5 ! echo $ECHO_N "checking if wxWidgets xml library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 6822,6827 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xrc,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets xrc bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets xrc bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6822,6827 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xrc,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets xrc library is available" >&5 ! echo $ECHO_N "checking if wxWidgets xrc library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 6913,6918 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs richtext,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets richtext bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets richtext bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 6913,6918 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs richtext,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets richtext library is available" >&5 ! echo $ECHO_N "checking if wxWidgets richtext library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 7007,7012 **** LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs stc,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets stc bindings are available" >&5 ! echo $ECHO_N "checking if wxWidgets stc bindings are available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF --- 7007,7012 ---- LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs stc,$WXLIB_NAMES` ! { echo "$as_me:$LINENO: checking if wxWidgets stc library is available" >&5 ! echo $ECHO_N "checking if wxWidgets stc library is available... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF *************** *** 7315,7323 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7315,7319 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7338,7346 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7334,7338 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7361,7369 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7353,7357 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7385,7393 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7373,7377 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7408,7416 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7392,7396 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7431,7439 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7411,7415 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7454,7462 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7430,7434 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7477,7485 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7449,7453 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7500,7508 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7468,7472 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7523,7531 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7487,7491 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7546,7554 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7506,7510 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7569,7577 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7525,7529 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7592,7600 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7544,7548 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7615,7623 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7563,7567 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7638,7646 **** _TMP=$wx_temp ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi --- 7582,7586 ---- _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi *************** *** 7658,7662 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindadv" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindadv""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7598,7601 ---- *************** *** 7680,7684 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindaui" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindaui""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7619,7622 ---- *************** *** 7702,7706 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindbase" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindbase""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7640,7643 ---- *************** *** 7724,7728 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindcore" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindcore""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7661,7664 ---- *************** *** 7746,7750 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindgl" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindgl""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7682,7685 ---- *************** *** 7768,7772 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindhtml" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindhtml""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7703,7706 ---- *************** *** 7790,7794 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindmedia" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindmedia""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7724,7727 ---- *************** *** 7812,7816 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindnet" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindnet""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7745,7748 ---- *************** *** 7834,7838 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindrichtext" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindrichtext""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7766,7769 ---- *************** *** 7856,7860 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindstc" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindstc""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7787,7790 ---- *************** *** 7878,7882 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindxml" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindxml""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7808,7811 ---- *************** *** 7900,7904 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindxrc" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindxrc""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7829,7832 ---- *************** *** 7923,7927 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxluasocket" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxluasocket""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7851,7854 ---- *************** *** 7945,7949 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxluadebug" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxluadebug""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7872,7875 ---- *************** *** 7967,7971 **** WXLUA_MODNAMES="$WXLUA_MODNAMES wxlua" - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxlua""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" wx_temp="wxlua""_""$WX_PORT" --- 7893,7896 ---- *************** *** 11336,11340 **** CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim - WXLIBS_REQUIRED!$WXLIBS_REQUIRED$ac_delim WX_CONFIG_PATH!$WX_CONFIG_PATH$ac_delim WX_CPPFLAGS!$WX_CPPFLAGS$ac_delim --- 11261,11264 ---- *************** *** 11374,11377 **** --- 11298,11302 ---- AROPTIONS!$AROPTIONS$ac_delim STRIP!$STRIP$ac_delim + NM!$NM$ac_delim _ACEOF *************** *** 11415,11419 **** for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF - NM!$NM$ac_delim INSTALL_DIR!$INSTALL_DIR$ac_delim LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim --- 11340,11343 ---- *************** *** 11512,11515 **** --- 11436,11440 ---- COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim + COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim _ACEOF *************** *** 11553,11557 **** for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF - COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$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 --- 11478,11481 ---- *************** *** 11569,11573 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then break elif $ac_last_try; then --- 11493,11497 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then break elif $ac_last_try; then *************** *** 12167,12171 **** echo " libdir : '$libdir'" echo " datadir : '$datadir'" - echo #echo " - wxWidgets wx-config information summary: " --- 12091,12094 ---- |
|
From: Francesco M. <fr...@us...> - 2008-01-14 13:21:59
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18731/build/autoconf Modified Files: configure.ac Log Message: fix WXLUA_LIBS creation and add better comments Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** configure.ac 14 Jan 2008 12:13:33 -0000 1.55 --- configure.ac 14 Jan 2008 13:21:55 -0000 1.56 *************** *** 173,176 **** --- 173,177 ---- WXLIB_NAMES="core,base" + # Initial list of wxLua libraries WXLUA_LIBS="-llua5.1" *************** *** 184,194 **** AC_PROG_CXX - #WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base" FIXME should also check for net and xml - WXLIBS_REQUIRED="net,xml,core,base" - AC_SUBST(WXLIBS_REQUIRED) - # standard wxWidgets checks: WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS ! WX_CONFIG_CHECK([2.8.0], [wxWin=1], , [$WXLIBS_REQUIRED], [$WXCONFIG_FLAGS]) WX_DETECT_STANDARD_OPTION_VALUES --- 185,195 ---- AC_PROG_CXX # standard wxWidgets checks: + # NOTE: the 'core,base' string passed to WX_CONFIG_CHECK macro here + # is just a fake list of the required wxWidgets libraries. + # Later we'll check for the existence of each wxWidgets library + # and then we'll rebuild the WX_LIBS string WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS ! WX_CONFIG_CHECK([2.8.0], [wxWin=1], [], [core,base], [$WXCONFIG_FLAGS]) WX_DETECT_STANDARD_OPTION_VALUES *************** *** 305,309 **** dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets $1 bindings are available]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <$3>], --- 306,310 ---- dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets $1 library is available]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <$3>], *************** *** 580,588 **** if test $1 == "1"; then WX_LIKE_LIBNAME([_TMP], [wxlua], [$2]) ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi ]) --- 581,585 ---- if test $1 == "1"; then WX_LIKE_LIBNAME([_TMP], [wxlua], [$2]) ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" fi ]) *************** *** 619,623 **** dnl the set of the wxLua library names - #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_$1""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" WX_LIKE_LIBNAME([_TMP], [wxlua], [$1]) WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" --- 616,619 ---- |
|
From: Francesco M. <fr...@us...> - 2008-01-14 13:21:01
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18287/build/autoconf Modified Files: wxwin.m4 Log Message: always define BUILD variable Index: wxwin.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxwin.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxwin.m4 14 Jan 2008 12:11:14 -0000 1.3 --- wxwin.m4 14 Jan 2008 13:20:55 -0000 1.4 *************** *** 938,948 **** if test "$DEBUG" = "auto"; then DEBUG=$WX_DEBUG - - dnl in case user wants a BUILD=debug/release var... - if test "$DEBUG" = "1"; then - BUILD="debug" - elif test "$DEBUG" = ""; then - BUILD="release" - fi fi if test "$UNICODE" = "auto"; then --- 938,941 ---- *************** *** 956,959 **** --- 949,959 ---- fi + dnl in case the user needs a BUILD=debug/release var... + if test "$DEBUG" = "1"; then + BUILD="debug" + elif test "$DEBUG" = ""; then + BUILD="release" + fi + dnl respect the DEBUG variable adding the optimize/debug flags dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we |
|
From: Francesco M. <fr...@us...> - 2008-01-14 12:13:46
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23999 Modified Files: configure Log Message: cleaned up the wxWidgets libraries detection using a WX_CHECK_FOR_WXLIB instead of lots of copy-and-paste; fixed the order to which libraries where given to wx-config --libs which was causing linker problems Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** configure 14 Jan 2008 05:09:44 -0000 1.65 --- configure 14 Jan 2008 12:13:32 -0000 1.66 *************** *** 687,690 **** --- 687,691 ---- WX_VERSION_MAJOR WX_VERSION_MINOR + WX_VERSION_MICRO WX_UNICODE WX_DEBUG *************** *** 1419,1445 **** Compiles the wxLuaFreeze app (default is yes) --enable-wxbindadv Compiles the wxLua bindings for wxAdvanced lib [...1849 lines suppressed...] ! echo " " --- 12167,12182 ---- echo " libdir : '$libdir'" echo " datadir : '$datadir'" ! echo ! #echo " - wxWidgets wx-config information summary: " ! #echo " wx-config : '$WX_CONFIG_NAME'" ! #echo " wx-config flags : '$WXCONFIG_FLAGS'" ! #echo " wx-config with args : '$WX_CONFIG_WITH_ARGS'" ! #echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" ! #echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" ! #echo " wx-config --selected-config : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --selected-config`'" ! #echo " wx-config --prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --prefix`'" ! #echo " wx-config --exec-prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --exec-prefix`'" ! #echo |
|
From: Francesco M. <fr...@us...> - 2008-01-14 12:13:46
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23999/build/autoconf Modified Files: aclocal.m4 configure.ac Log Message: cleaned up the wxWidgets libraries detection using a WX_CHECK_FOR_WXLIB instead of lots of copy-and-paste; fixed the order to which libraries where given to wx-config --libs which was causing linker problems Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** aclocal.m4 13 Jan 2008 19:51:04 -0000 1.52 --- aclocal.m4 14 Jan 2008 12:13:33 -0000 1.53 *************** *** 1,6 **** ! # generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** configure.ac 14 Jan 2008 05:09:45 -0000 1.54 --- configure.ac 14 Jan 2008 12:13:33 -0000 1.55 *************** *** 25,29 **** ## CONFIGURE OPTIONS ! ##################################################################### # standard wxWidgets options: --- 25,31 ---- ## CONFIGURE OPTIONS ! ################################################################################################# ! ################################################################################################# ! # standard wxWidgets options: *************** *** 56,61 **** [ 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_enabled="$wxbind_list_enabled,$1"]) ]) --- 58,64 ---- [ AC_ARG_ENABLE([$1], ! [AC_HELP_STRING([--enable-wxbind$1], ! [Compiles the wxLua bindings for $2 lib (default is auto)])], ! [], [enable_wxbind$1=auto]) ]) *************** *** 74,78 **** # remove initial comma: ! wxbind_list_enabled=${wxbind_list_enabled:1} AC_ARG_ENABLE([wxluadebug], --- 77,81 ---- # remove initial comma: ! #wxbind_list_enabled=${wxbind_list_enabled:1} AC_ARG_ENABLE([wxluadebug], *************** *** 102,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]) --- 105,120 ---- UTILS_YESNO_OPTCHECK([USE_WXLUAFREEZEAPP], [enable_wxluafreeze_app], [--enable-wxluafreeze-app]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDADV], [enable_wxbindadv], [--enable-wxbindadv]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDAUI], [enable_wxbindaui], [--enable-wxbindaui]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDBASE], [enable_wxbindbase], [--enable-wxbindbase]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDCORE], [enable_wxbindcore], [--enable-wxbindcore]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDGL], [enable_wxbindgl], [--enable-wxbindgl]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDHTML], [enable_wxbindhtml], [--enable-wxbindhtml]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDMEDIA], [enable_wxbindmedia], [--enable-wxbindmedia]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDNET], [enable_wxbindnet], [--enable-wxbindnet]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDRICHTEXT], [enable_wxbindrichtext], [--enable-wxbindrichtext]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDSTC], [enable_wxbindstc], [--enable-wxbindstc]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDXML], [enable_wxbindxml], [--enable-wxbindxml]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDXRC], [enable_wxbindxrc], [--enable-wxbindxrc]) UTILS_YESNO_OPTCHECK([USE_WXLUADEBUG], [enable_wxluadebug], [--enable-wxluadebug]) *************** *** 161,182 **** - AC_DEFUN([AC_WXLUABINDLIB_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_enabled="$wxbind_list_enabled,$1"]) - ]) - - ## Init libs, we will add to these as we check for their existance - ##################################################################### WXLIB_NAMES="core,base" - WXLUA_LIBS="-llua5.1" ! ! ## CONFIGURE CHECKS ! ##################################################################### # NB: to avoid getting "-g -02" automatically added to C*FLAGS we need --- 164,177 ---- + ## CONFIGURE CHECKS + ################################################################################################# + ################################################################################################# + # Initial wx libs, we will add more to these variables as we check for their existance WXLIB_NAMES="core,base" ! WXLUA_LIBS="-llua5.1" # NB: to avoid getting "-g -02" automatically added to C*FLAGS we need *************** *** 275,283 **** dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_ADV( ! dnl [action if found], ! dnl [action if not found]) dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_ADV], [ dnl save original flags into support variables --- 270,281 ---- dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_WXLIB([wx-lib name lowercase], ! dnl [wx-lib name uppercase prefixed by WX], ! dnl [wx-lib include file with final .h], ! dnl [a C++ line of code which tests for existence of the wx-lib], ! dnl [action if found], ! dnl [action if not found]) dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_WXLIB], [ dnl save original flags into support variables *************** *** 302,325 **** CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! dnl before WX_LIBS we want the lib of Adv ! # Note: The dependencies were found in wxGTK using ldd ! #WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) ! #LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,adv` dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets Adv bindings are available]) AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/grid.h>], ! [wxGrid dummy(NULL, -1, wxDefaultPosition);]) ], ! [WXADV_PRESENCE=1], [WXADV_PRESENCE=0]) ! if test "$WXADV_PRESENCE" = "1"; then AC_MSG_RESULT([yes]) ! $1 else AC_MSG_RESULT([no]) ! $2 fi --- 300,321 ---- CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! dnl the WXLIB_NAMES variable contains the names of the wxWidgets ! dnl library whose presence was already verified. ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs $1,$WXLIB_NAMES` dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets $1 bindings are available]) AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <$3>], ! [$4]) ], ! [$2_PRESENCE=1], [$2_PRESENCE=0]) ! if test "$$2_PRESENCE" = "1"; then AC_MSG_RESULT([yes]) ! $5 else AC_MSG_RESULT([no]) ! $6 fi *************** *** 328,772 **** ]) - WX_CHECK_FOR_ADV - if [[[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]]; then - - dnl # add to the library to link to the wxADV lib - dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [adv]) *** Doesn't work for static builds - dnl WX_LIBS="-l$_WX_ADV_LIBNAME $WX_LIBS" *** nor this - - # add adv to the list of wx-config --libs xxx - WXLIB_NAMES="adv,$WXLIB_NAMES" - else - USE_WXBINDADV=0 - CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXADV=0" - fi ! dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_AUI( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_AUI], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,adv,aui` ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets AUI bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/aui/aui.h>], ! [wxAuiPaneInfo dummy();]) ! ], ! [WXAUI_PRESENCE=1], [WXAUI_PRESENCE=0]) ! if test "$WXAUI_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! WX_CHECK_FOR_AUI ! if test "$WXAUI_PRESENCE" = "1"; then ! # add aui to the list of wx-config --libs ! WXLIB_NAMES="aui,$WXLIB_NAMES" ! else ! USE_WXBINDAUI=0 CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXAUI=0" fi ! dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_GL( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_GL], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,gl` ! ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets OpenGL bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/glcanvas.h>], ! [wxGLCanvas dummy(NULL, -1, wxDefaultPosition);]) ! ], ! [WXGL_PRESENCE=1], [WXGL_PRESENCE=0]) ! ! if test "$WXGL_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! WX_CHECK_FOR_GL ! if test "$WXGL_PRESENCE" = "1"; then ! # add gl to the list of wx-config --libs ! WXLIB_NAMES="gl,$WXLIB_NAMES" ! else ! USE_WXBINDGL=0 CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXGL=0" fi ! dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_HTML( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_HTML], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,html` ! ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets HTML bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/html/htmlcell.h>], ! [wxHtmlSelection dummy;]) ! ], ! [WXHTML_PRESENCE=1], [WXHTML_PRESENCE=0]) ! ! if test "$WXHTML_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! WX_CHECK_FOR_HTML ! if test "$WXHTML_PRESENCE" = "1"; then ! # add html to the list of wx-config --libs ! WXLIB_NAMES="html,$WXLIB_NAMES" ! else ! USE_WXBINDHTML=0 CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXHTML=0" fi ! dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_MEDIA( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_MEDIA], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,media` ! ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets Media bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/mediactrl.h>], ! [wxMediaCtrl dummy();]) ! ], ! [WXMEDIA_PRESENCE=1], [WXMEDIA_PRESENCE=0]) ! ! if test "$WXMEDIA_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! WX_CHECK_FOR_MEDIA ! if test "$WXMEDIA_PRESENCE" = "1"; then ! # add media to the list of wx-config --libs ! WXLIB_NAMES="media,$WXLIB_NAMES" ! else ! USE_WXBINDMEDIA=0 CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXMEDIA=0" fi ! dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_NET( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_NET], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,net` ! ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets Net bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/socket.h>], ! [wxSocketClient dummy;]) ! ], ! [WXNET_PRESENCE=1], [WXNET_PRESENCE=0]) ! ! if test "$WXNET_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! WX_CHECK_FOR_NET ! if test "$WXNET_PRESENCE" = "1"; then ! # add net to the list of wx-config --libs ! WXLIB_NAMES="net,$WXLIB_NAMES" ! else ! USE_WXBINDNET=0 CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0" fi ! dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_RICHTEXT( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_RICHTEXT], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,xml,html,adv,richtext` ! ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets Richtext bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/richtext/richtextctrl.h>], ! [wxRichTextCtrl dummy;]) ! ], ! [WXRICHTEXT_PRESENCE=1], [WXRICHTEXT_PRESENCE=0]) ! ! if test "$WXRICHTEXT_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! WX_CHECK_FOR_RICHTEXT ! if test "$WXRICHTEXT_PRESENCE" = "1"; then ! # add richtext to the list of wx-config --libs ! WXLIB_NAMES="richtext,$WXLIB_NAMES" ! else ! USE_WXBINDRICHTEXT=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXRICHTEXT=0" fi ! ! ! dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_XML( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_XML], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,xml` ! ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets XML bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/xml/xml.h>], ! [wxXmlProperty dummy;]) ! ], ! [WXXML_PRESENCE=1], [WXXML_PRESENCE=0]) ! ! if test "$WXXML_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! ! WX_CHECK_FOR_XML ! if test "$WXXML_PRESENCE" = "1"; then ! # add xrc to the list of wx-config --libs ! WXLIB_NAMES="xml,$WXLIB_NAMES" ! else ! USE_WXBINDXML=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0" fi ! dnl --------------------------------------------------------------------------- ! dnl WX_CHECK_FOR_XRC( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_CHECK_FOR_XRC], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,xml,core,adv,html,xrc` ! ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets XRC bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/xrc/xh_all.h>], ! [wxSizerXmlHandler dummy;]) ! ], ! [WXXRC_PRESENCE=1], [WXXRC_PRESENCE=0]) ! ! if test "$WXXRC_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! WX_CHECK_FOR_XRC ! if test "$WXXRC_PRESENCE" = "1"; then ! # add xrc to the list of wx-config --libs ! WXLIB_NAMES="xrc,$WXLIB_NAMES" ! else ! USE_WXBINDXRC=0 CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXRC=0" fi ! dnl --------------------------------------------------------------------------- ! dnl WX_STC_CHECK( ! dnl [action if found], ! dnl [action if not found]) ! dnl --------------------------------------------------------------------------- ! AC_DEFUN([WX_STC_CHECK], ! [ ! dnl save original flags into support variables ! UTILS_SAVE_COREVAR() ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,stc` ! ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets STC contrib is available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/stc/stc.h>], ! [wxStyledTextCtrl dummy;]) ! ], ! [WXSTC_PRESENCE=1], [WXSTC_PRESENCE=0]) ! ! if test "$WXSTC_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi ! ! dnl restore the original flags ! UTILS_RESTORE_COREVAR() ! ]) ! # check for STC wrapper for wxWidgets ! if [[ "$USE_WXBINDSTC" = "1" ]]; then ! AC_CACHE_VAL([ac_cv_prog_stc_set], ! [WX_STC_CHECK([ac_cv_prog_stc_set=1], [ac_cv_prog_stc_set=0])]) ! if test $ac_cv_prog_stc_set = "1"; then ! # add stc to the list of wx-config --libs ! WXLIB_NAMES="stc,$WXLIB_NAMES" ! else ! WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" ! AC_MSG_NOTICE([ ! The wxWidgets wrappers for Scintilla text control could not be found ! (at least not for the '$WXBUILD_STR' wxWidgets build). ! Please be sure that you compiled and installed it since they are ! not built together with wxWidgets by default. ! E.g. from wxWidgets build directory type: ! cd contrib/src/stc && make && sudo make install ! cd contrib/samples/stc && make ! If you still get this error message, look at config.log for more details ! or report this problem to $PACKAGE_BUGREPORT. ! NOTE: build is proceeding without Scintilla wrappers, but you will miss ! the wxLuaApp and wxLuaEdit applications! ! ]) ! USE_WXBINDSTC=0 ! USE_WXLUAAPP=0 ! USE_WXLUAEDITAPP=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" ! fi ! else # these depends from wxSTC ! USE_WXLUAAPP=0 USE_WXLUAEDITAPP=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" fi dnl --------------------------------------------------------------------------- dnl wxStEdit check --- 324,522 ---- ]) + # + # now check for wxWidgets libraries presence in the correct order + # + # NOTE: in wx >= 2.9 this won't be necessary since we'll be able to + # simply search in the `wx-config --libs all` string which + # contains all the available wx libraries for a certain wx build + # ! if [[[ "$USE_WXBINDADV" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([adv], [WXADV], ! [wx/grid.h], [wxGrid dummy(NULL, -1, wxDefaultPosition);], ! [USE_WXBINDADV=1; WXLIB_NAMES="adv,$WXLIB_NAMES"], ! [USE_WXBINDADV=0]) ! fi ! if [[[ "$USE_WXBINDADV" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXADV=0" ! fi ! if [[[ "$USE_WXBINDAUI" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([aui], [WXAUI], ! [wx/aui/aui.h], [wxAuiPaneInfo dummy();], ! [USE_WXBINDAUI=1; WXLIB_NAMES="aui,$WXLIB_NAMES"], ! [USE_WXBINDAUI=0]) ! fi ! if [[[ "$USE_WXBINDAUI" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXAUI=0" fi + if [[[ "$USE_WXBINDGL" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([gl], [WXGL], ! [wx/glcanvas.h], [wxGLCanvas dummy(NULL, -1, wxDefaultPosition);], ! [USE_WXBINDGL=1; WXLIB_NAMES="gl,$WXLIB_NAMES"], ! [USE_WXBINDGL=0]) ! fi ! if [[[ "$USE_WXBINDGL" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXGL=0" fi + if [[[ "$USE_WXBINDHTML" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([html], [WXHTML], ! [wx/html/htmlcell.h], [wxHtmlSelection dummy;], ! [USE_WXBINDHTML=1; WXLIB_NAMES="html,$WXLIB_NAMES"], ! [USE_WXBINDHTML=0]) ! fi ! if [[[ "$USE_WXBINDHTML" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXHTML=0" fi + if [[[ "$USE_WXBINDMEDIA" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([media], [WXMEDIA], ! [wx/mediactrl.h], [wxMediaCtrl dummy();], ! [USE_WXBINDMEDIA=1; WXLIB_NAMES="media,$WXLIB_NAMES"], ! [USE_WXBINDMEDIA=0]) ! fi ! if [[[ "$USE_WXBINDMEDIA" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXMEDIA=0" fi + if [[[ "$USE_WXBINDNET" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([net], [WXNET], ! [wx/socket.h], [wxSocketClient dummy;], ! [USE_WXBINDNET=1; WXLIB_NAMES="net,$WXLIB_NAMES"], ! [USE_WXBINDNET=0]) ! fi ! if [[[ "$USE_WXBINDNET" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0" fi + if [[[ "$USE_WXBINDXML" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([xml], [WXXML], ! [wx/xml/xml.h], [wxXmlProperty dummy;], ! [USE_WXBINDXML=1; WXLIB_NAMES="xml,$WXLIB_NAMES"], ! [USE_WXBINDXML=0]) fi ! if [[[ "$USE_WXBINDXML" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0" fi + if [[[ "$USE_WXBINDXRC" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([xrc], [WXXRC], ! [wx/xrc/xh_all.h], [wxSizerXmlHandler dummy;], ! [USE_WXBINDXRC=1; WXLIB_NAMES="xrc,$WXLIB_NAMES"], ! [USE_WXBINDXRC=0]) ! fi ! if [[[ "$USE_WXBINDXRC" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXRC=0" fi + if [[[ "$USE_WXBINDRICHTEXT" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: + WX_CHECK_FOR_WXLIB([richtext], [WXRICHTEXT], + [wx/richtext/richtextctrl.h], [wxRichTextCtrl dummy;], + [USE_WXBINDRICHTEXT=1; WXLIB_NAMES="richtext,$WXLIB_NAMES"], + [USE_WXBINDRICHTEXT=0]) + fi + if [[[ "$USE_WXBINDRICHTEXT" = "0" ]]]; then + # either the user set --enable-wxbindXXX=no or the test above failed + # as the wx XXX library is not available... + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXRICHTEXT=0" + fi ! # NOTE: even if the STC library is a contrib in wx <= 2.8, we can still use ! # the WX_CHECK_FOR_WXLIB macro to test for it ! if [[[ "$USE_WXBINDSTC" = "1" ]]]; then ! # the user set the relative --enable-wxbindXXX option to 'auto' or to 'yes' value: ! # check if the XXX library is available: ! WX_CHECK_FOR_WXLIB([stc], [WXSTC], ! [wx/stc/stc.h], [wxStyledTextCtrl dummy;], ! [USE_WXBINDSTC=1; WXLIB_NAMES="stc,$WXLIB_NAMES"], ! [USE_WXBINDSTC=0]) ! fi ! if [[[ "$USE_WXBINDSTC" = "0" ]]]; then ! # either the user set --enable-wxbindXXX=no or the test above failed ! # as the wx XXX library is not available... ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" # these depends from wxSTC ! USE_WXLUAAPP=0 USE_WXLUAEDITAPP=0 ! ! WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" ! AC_MSG_NOTICE([ ! The wxWidgets wrappers for Scintilla text control could not be found ! (at least not for the '$WXBUILD_STR' wxWidgets build). ! Please be sure that you compiled and installed it since they are ! not built together with wxWidgets <= 2.8 by default. ! E.g. from wxWidgets build directory type: ! ! cd contrib/src/stc && make && sudo make install ! cd contrib/samples/stc && make ! ! If you still get this error message, look at config.log for more details ! or report this problem to $PACKAGE_BUGREPORT. ! NOTE: build is proceeding without Scintilla wrappers, but you will miss ! the wxLuaApp and wxLuaEdit applications! ! ]) fi + dnl --------------------------------------------------------------------------- dnl wxStEdit check *************** *** 818,822 **** fi ! dnl --------------------------------------------------------------------------- # recreate the wx-config --libs after determining what libs we've found --- 568,573 ---- fi ! # -------------------------------------------------------------------------- ! # -------------------------------------------------------------------------- # recreate the wx-config --libs after determining what libs we've found *************** *** 828,832 **** [ if test $1 == "1"; then - #"-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$2-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" WX_LIKE_LIBNAME([_TMP], [wxlua], [$2]) if test "$SHARED" = "1" ; then --- 579,582 ---- *************** *** 859,864 **** ! dnl -------------------------------------------------------------------------- ! dnl -------------------------------------------------------------------------- # Produce some useful info for pkg-config: --- 609,614 ---- ! # -------------------------------------------------------------------------- ! # -------------------------------------------------------------------------- # Produce some useful info for pkg-config: *************** *** 910,914 **** ## END OF CONFIGURE SCRIPT ! ##################################################################### AC_BAKEFILE([m4_include(autoconf_inc.m4)]) --- 660,665 ---- ## END OF CONFIGURE SCRIPT ! ################################################################################################# ! ################################################################################################# AC_BAKEFILE([m4_include(autoconf_inc.m4)]) *************** *** 1015,1018 **** --- 766,775 ---- [" - enable_wxbindxrc module: no"]) + echo + echo " - compact list of the wxWidgets library for which" + echo " binding modules will be created: " + echo " $WXLIB_NAMES" + echo + UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], [" - enable_wxluadebug module: yes"], *************** *** 1031,1054 **** [" - install custom wxBind stuff: no"]) - echo " " - echo " - wxBind modules desired by configure options: " - echo " $wxbind_list_enabled" - - echo " - wxBind modules that will be created satisfying dependencies: " - echo " $WXLIB_NAMES" - echo " " - # It is sometimes hard to dig out these values from the Makefiles ! echo " - wxLua complier and linker directives summary: " ! echo " CFLAGS : '$CFLAGS'" ! echo " CXXFLAGS : '$CXXFLAGS'" ! echo " CPPFLAGS : '$CPPFLAGS'" ! echo " WX_CXXFLAGS : '$WX_CXXFLAGS'" ! echo " LDFLAGS : '$LDFLAGS'" ! echo " WX_LIBS : '$WX_LIBS'" ! echo " WXLUA_LIBS : '$WXLUA_LIBS'" ! echo " " echo " - wxLua make install path settings:" echo " prefix : '$prefix'" --- 788,804 ---- [" - install custom wxBind stuff: no"]) # It is sometimes hard to dig out these values from the Makefiles ! #echo " - wxLua compiler and linker directives summary: " ! #echo " CFLAGS : '$CFLAGS'" ! #echo " CXXFLAGS : '$CXXFLAGS'" ! #echo " CPPFLAGS : '$CPPFLAGS'" ! #echo " WX_CXXFLAGS : '$WX_CXXFLAGS'" ! #echo " LDFLAGS : '$LDFLAGS'" ! #echo " WX_LIBS : '$WX_LIBS'" ! #echo " WXLUA_LIBS : '$WXLUA_LIBS'" ! #echo " " + echo echo " - wxLua make install path settings:" echo " prefix : '$prefix'" *************** *** 1056,1071 **** echo " libdir : '$libdir'" echo " datadir : '$datadir'" - echo " " ! echo " - wxWidgets wx-config information summary: " ! echo " wx-config : '$WX_CONFIG_NAME'" ! echo " wx-config flags : '$WXCONFIG_FLAGS'" ! echo " wx-config with args : '$WX_CONFIG_WITH_ARGS'" ! echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" ! echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" ! echo " wx-config --selected-config : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --selected-config`'" ! echo " wx-config --prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --prefix`'" ! echo " wx-config --exec-prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --exec-prefix`'" ! echo " " WX_STANDARD_OPTIONS_SUMMARY_MSG_END --- 806,820 ---- echo " libdir : '$libdir'" echo " datadir : '$datadir'" ! #echo " - wxWidgets wx-config information summary: " ! #echo " wx-config : '$WX_CONFIG_NAME'" ! #echo " wx-config flags : '$WXCONFIG_FLAGS'" ! #echo " wx-config with args : '$WX_CONFIG_WITH_ARGS'" ! #echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" ! #echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" ! #echo " wx-config --selected-config : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --selected-config`'" ! #echo " wx-config --prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --prefix`'" ! #echo " wx-config --exec-prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --exec-prefix`'" ! #echo WX_STANDARD_OPTIONS_SUMMARY_MSG_END |
|
From: Francesco M. <fr...@us...> - 2008-01-14 12:11:35
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23335 Modified Files: utils.m4 Log Message: added the UTILS_YESNOAUTO_OPTCHECK macro Index: utils.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/utils.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** utils.m4 26 Jul 2007 22:08:11 -0000 1.1 --- utils.m4 14 Jan 2008 12:11:32 -0000 1.2 *************** *** 30,33 **** --- 30,66 ---- dnl --------------------------------------------------------------------------- + dnl UTILS_YESNOAUTO_OPTCHECK([name of the boolean variable to set], + dnl [name of the --enable-option variable with yes/no/auto values], + dnl [name of the --enable option]) + dnl + dnl Converts the $3 variable, suppose to contain a yes/no/auto value to a 1/0 + dnl boolean variable and saves the result into $1. + dnl Outputs also the standard checking-option message. + dnl --------------------------------------------------------------------------- + AC_DEFUN([UTILS_YESNOAUTO_OPTCHECK], + [ + AC_MSG_CHECKING([for the $3 option]) + if [[ "x$$2" = "xyes" ]]; then + AC_MSG_RESULT([yes]) + $1=1 + elif [[ "x$$2" = "xauto" ]]; then + AC_MSG_RESULT([auto]) + + dnl We set $1 variable to "1" even if the user given the 'auto' option + dnl value because the configure script is supposed to check for the + dnl correctness of this option both in case "automatic" configuration + dnl is enabled both in case the user explicitely gives a "yes" value + dnl (think to external library checks: both in case 'auto' or 'yes' is + dnl given, the configure script will need to check the external library + dnl do exists and disable $1 variable if it does not). + $1=1 + else + AC_MSG_RESULT([no]) + $1=0 + fi + ]) + + + dnl --------------------------------------------------------------------------- dnl UTILS_BOOLOPT_SUMMARY([name of the boolean variable to show summary for], dnl [what to print when var is 1], |
|
From: Francesco M. <fr...@us...> - 2008-01-14 12:11:19
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23204 Modified Files: wxwin.m4 Log Message: fixed WX_VERSION name clash updating to the wxSVN trunk version Index: wxwin.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxwin.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxwin.m4 12 Jan 2008 09:58:46 -0000 1.2 --- wxwin.m4 14 Jan 2008 12:11:14 -0000 1.3 *************** *** 374,382 **** dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols ! dnl to support wxpresets bakefiles WX_VERSION_MAJOR="$wx_config_major_version" WX_VERSION_MINOR="$wx_config_minor_version" AC_SUBST(WX_VERSION_MAJOR) AC_SUBST(WX_VERSION_MINOR) ]) --- 374,384 ---- dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols ! dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness): WX_VERSION_MAJOR="$wx_config_major_version" WX_VERSION_MINOR="$wx_config_minor_version" + WX_VERSION_MICRO="$wx_config_micro_version" AC_SUBST(WX_VERSION_MAJOR) AC_SUBST(WX_VERSION_MINOR) + AC_SUBST(WX_VERSION_MICRO) ]) *************** *** 471,475 **** dnl the $lib variable to: dnl 'mine_gtk2ud_test-2.8' ! dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_VERSION=28 dnl --------------------------------------------------------------------------- AC_DEFUN([WX_LIKE_LIBNAME], --- 473,477 ---- dnl the $lib variable to: dnl 'mine_gtk2ud_test-2.8' ! dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28 dnl --------------------------------------------------------------------------- AC_DEFUN([WX_LIKE_LIBNAME], *************** *** 560,563 **** --- 562,566 ---- dnl --enable-[debug|unicode|shared|wxshared|wxdebug] dnl --with-[gtk|msw|motif|x11|mac|mgl|dfb] + dnl --with-wxversion dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED, dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values. *************** *** 658,662 **** dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option ! dnl which must be able to accept the auto|26|27|28... values ifelse(index([$1], [wxversion]), [-1],, [ --- 661,665 ---- dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option ! dnl which accepts the "auto|2.6|2.7|2.8|2.9|3.0" etc etc values ifelse(index([$1], [wxversion]), [-1],, [ *************** *** 670,674 **** if test "$withval" = "auto" ; then AC_MSG_RESULT([will be automatically detected]) ! WX_VERSION="auto" else --- 673,677 ---- if test "$withval" = "auto" ; then AC_MSG_RESULT([will be automatically detected]) ! WX_RELEASE="auto" else *************** *** 682,691 **** "${#wx_requested_minor_version}" != "1" ; then AC_MSG_ERROR([ ! Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9) ]) fi ! WX_VERSION="$wx_requested_major_version"".""$wx_requested_minor_version" ! AC_MSG_RESULT([$WX_VERSION]) fi ]) --- 685,694 ---- "${#wx_requested_minor_version}" != "1" ; then AC_MSG_ERROR([ ! Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9, 3.0) ]) fi ! WX_RELEASE="$wx_requested_major_version"".""$wx_requested_minor_version" ! AC_MSG_RESULT([$WX_RELEASE]) fi ]) *************** *** 696,700 **** echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED" echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT" ! echo "[[dbg]] VERSION: $VERSION, WX_VERSION: $WX_VERSION" fi ]) --- 699,703 ---- echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED" echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT" ! echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE" fi ]) *************** *** 733,738 **** fi ! if test "$WX_VERSION" != "auto" ; then ! WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_VERSION " fi --- 736,741 ---- fi ! if test "$WX_RELEASE" != "auto" ; then ! WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE " fi *************** *** 788,792 **** dnl dnl Detects the values of the following variables: ! dnl 1) WX_VERSION dnl 2) WX_UNICODE dnl 3) WX_DEBUG --- 791,795 ---- dnl dnl Detects the values of the following variables: ! dnl 1) WX_RELEASE dnl 2) WX_UNICODE dnl 3) WX_DEBUG *************** *** 801,806 **** AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], [ ! WX_VERSION="$WX_VERSION_MAJOR""$WX_VERSION_MINOR" ! if test $WX_VERSION -lt 26 ; then AC_MSG_ERROR([ --- 804,811 ---- AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], [ ! dnl IMPORTANT: WX_VERSION contains all three major.minor.micro digits, ! dnl while WX_RELEASE only the major.minor ones. ! WX_RELEASE="$WX_VERSION_MAJOR""$WX_VERSION_MINOR" ! if test $WX_RELEASE -lt 26 ; then AC_MSG_ERROR([ *************** *** 908,912 **** echo "[[dbg]] WX_UNICODE: $WX_UNICODE" echo "[[dbg]] WX_SHARED: $WX_SHARED" ! echo "[[dbg]] WX_VERSION: $WX_VERSION" echo "[[dbg]] WX_PORT: $WX_PORT" fi --- 913,917 ---- echo "[[dbg]] WX_UNICODE: $WX_UNICODE" echo "[[dbg]] WX_SHARED: $WX_SHARED" ! echo "[[dbg]] WX_RELEASE: $WX_RELEASE" echo "[[dbg]] WX_PORT: $WX_PORT" fi |
|
From: John L. <jr...@us...> - 2008-01-14 05:09:48
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16536/wxLua/build/autoconf Modified Files: configure.ac Log Message: Use wx-config --libs base,core,adv, i.e. add base,core since they may not be added for old wx-config versions. Note: 2.9 should do this for us. Honor --enable-shared=no for wxLua to generate static libs and properly link to them using -l../lib/wxlua_xxx.a and not just -lwxlua_xxx Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** configure.ac 13 Jan 2008 19:51:04 -0000 1.53 --- configure.ac 14 Jan 2008 05:09:45 -0000 1.54 *************** *** 303,309 **** dnl before WX_LIBS we want the lib of Adv #WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) #LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs adv` dnl check for this component presence --- 303,310 ---- dnl before WX_LIBS we want the lib of Adv + # Note: The dependencies were found in wxGTK using ldd #WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) #LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,adv` dnl check for this component presence *************** *** 330,338 **** if [[[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]]; then ! dnl # add to the library to link to the wxSTC lib *** Doesn't work for static builds ! dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! dnl WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" ! # add adv to the list of wx-config --libs WXLIB_NAMES="adv,$WXLIB_NAMES" else --- 331,339 ---- if [[[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]]; then ! dnl # add to the library to link to the wxADV lib ! dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [adv]) *** Doesn't work for static builds ! dnl WX_LIBS="-l$_WX_ADV_LIBNAME $WX_LIBS" *** nor this ! # add adv to the list of wx-config --libs xxx WXLIB_NAMES="adv,$WXLIB_NAMES" else *************** *** 354,358 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs aui` dnl check for this component presence --- 355,359 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,adv,aui` dnl check for this component presence *************** *** 398,402 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs gl` dnl check for this component presence --- 399,403 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,gl` dnl check for this component presence *************** *** 442,446 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs html` dnl check for this component presence --- 443,447 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,html` dnl check for this component presence *************** *** 486,490 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs media` dnl check for this component presence --- 487,491 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,media` dnl check for this component presence *************** *** 530,534 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs net` dnl check for this component presence --- 531,535 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,net` dnl check for this component presence *************** *** 574,578 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs richtext` dnl check for this component presence --- 575,579 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,xml,html,adv,richtext` dnl check for this component presence *************** *** 618,622 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xml` dnl check for this component presence --- 619,623 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,xml` dnl check for this component presence *************** *** 662,666 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xrc` dnl check for this component presence --- 663,667 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,xml,core,adv,html,xrc` dnl check for this component presence *************** *** 706,710 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs stc` dnl check for this component presence --- 707,711 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs base,core,stc` dnl check for this component presence *************** *** 827,834 **** [ if test $1 == "1"; then WX_LIKE_LIBNAME([_TMP], [wxlua], [$2]) ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$1="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$2-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" ! fi ]) --- 828,838 ---- [ if test $1 == "1"; then + #"-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$2-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" WX_LIKE_LIBNAME([_TMP], [wxlua], [$2]) ! if test "$SHARED" = "1" ; then ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! else ! WXLUA_LIBS="-l\$top_builddir/lib/lib$_TMP"".a $WXLUA_LIBS" ! fi fi ]) *************** *** 863,870 **** dnl the set of the module names, comma separed WXLUA_MODNAMES="$WXLUA_MODNAMES $1" - TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_$1""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" dnl the set of the wxLua library names ! WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP" dnl the set of the wxLua library names prefixed with -l --- 867,875 ---- dnl the set of the module names, comma separed WXLUA_MODNAMES="$WXLUA_MODNAMES $1" dnl the set of the wxLua library names ! #TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_$1""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" ! WX_LIKE_LIBNAME([_TMP], [wxlua], [$1]) ! WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" dnl the set of the wxLua library names prefixed with -l |
|
From: John L. <jr...@us...> - 2008-01-14 05:09:48
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16536/wxLua Modified Files: configure Log Message: Use wx-config --libs base,core,adv, i.e. add base,core since they may not be added for old wx-config versions. Note: 2.9 should do this for us. Honor --enable-shared=no for wxLua to generate static libs and properly link to them using -l../lib/wxlua_xxx.a and not just -lwxlua_xxx Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** configure 12 Jan 2008 09:58:46 -0000 1.64 --- configure 14 Jan 2008 05:09:44 -0000 1.65 *************** *** 6104,6110 **** CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! #WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) #LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs adv` { echo "$as_me:$LINENO: checking if wxWidgets Adv bindings are available" >&5 --- 6104,6111 ---- CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" [...1015 lines suppressed...] ! ! WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" *************** *** 11832,11836 **** echo " " ! echo " - wxWidgets library information summary: " echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" --- 12088,12095 ---- echo " " ! echo " - wxWidgets wx-config information summary: " ! echo " wx-config : '$WX_CONFIG_NAME'" ! echo " wx-config flags : '$WXCONFIG_FLAGS'" ! echo " wx-config with args : '$WX_CONFIG_WITH_ARGS'" echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" |
|
From: John L. <jr...@us...> - 2008-01-13 19:51:14
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26904/build/autoconf Modified Files: aclocal.m4 configure.ac Log Message: Output even more debugging info about wx-config's output Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** aclocal.m4 12 Jan 2008 09:58:46 -0000 1.51 --- aclocal.m4 13 Jan 2008 19:51:04 -0000 1.52 *************** *** 1,6 **** ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** configure.ac 12 Jan 2008 09:58:46 -0000 1.52 --- configure.ac 13 Jan 2008 19:51:04 -0000 1.53 *************** *** 1053,1057 **** echo " " ! echo " - wxWidgets library information summary: " echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" --- 1053,1060 ---- echo " " ! echo " - wxWidgets wx-config information summary: " ! echo " wx-config : '$WX_CONFIG_NAME'" ! echo " wx-config flags : '$WXCONFIG_FLAGS'" ! echo " wx-config with args : '$WX_CONFIG_WITH_ARGS'" echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" |
|
From: Francesco M. <fr...@us...> - 2008-01-12 09:58:51
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24693 Modified Files: configure Log Message: updated the wxwin.m4 from wxTRUNK, so that it works also with newer (2.9) wx-config scripts Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** configure 11 Jan 2008 23:39:04 -0000 1.63 --- configure 12 Jan 2008 09:58:46 -0000 1.64 *************** *** 683,687 **** WX_LIBS WX_LIBS_STATIC ! WX_VERSION_FULL WX_RESCOMP WX_VERSION_MAJOR --- 683,687 ---- WX_LIBS WX_LIBS_STATIC ! WX_VERSION WX_RESCOMP WX_VERSION_MAJOR *************** *** 2036,2040 **** ! # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then enableval=$enable_debug; --- 2036,2040 ---- ! # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then enableval=$enable_debug; *************** *** 4317,4321 **** if test "$WX_CONFIG_PATH" != "no" ; then ! WX_VERSION_FULL="" min_wx_version=2.8.0 --- 4317,4321 ---- if test "$WX_CONFIG_PATH" != "no" ; then ! WX_VERSION="" min_wx_version=2.8.0 *************** *** 4328,4339 **** fi ! WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $WXCONFIG_FLAGS $WXLIBS_REQUIRED" ! WX_VERSION_FULL=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` ! wx_config_major_version=`echo $WX_VERSION_FULL | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` ! wx_config_minor_version=`echo $WX_VERSION_FULL | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` ! wx_config_micro_version=`echo $WX_VERSION_FULL | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` --- 4328,4339 ---- fi ! WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $WXCONFIG_FLAGS" ! WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` ! wx_config_major_version=`echo $WX_VERSION | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` ! wx_config_minor_version=`echo $WX_VERSION | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` ! wx_config_micro_version=`echo $WX_VERSION | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` *************** *** 4347,4351 **** wx_ver_ok="" ! if test "x$WX_VERSION_FULL" != x ; then if test $wx_config_major_version -gt $wx_requested_major_version; then wx_ver_ok=yes --- 4347,4351 ---- wx_ver_ok="" ! if test "x$WX_VERSION" != x ; then if test $wx_config_major_version -gt $wx_requested_major_version; then wx_ver_ok=yes *************** *** 4367,4378 **** if test -n "$wx_ver_ok"; then ! ! { echo "$as_me:$LINENO: result: yes (version $WX_VERSION_FULL)" >&5 ! echo "${ECHO_T}yes (version $WX_VERSION_FULL)" >&6; } ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs` { echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6; } ! WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null` if test "x$WX_LIBS_STATIC" = "x"; then { echo "$as_me:$LINENO: result: no" >&5 --- 4367,4377 ---- if test -n "$wx_ver_ok"; then ! { echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 ! echo "${ECHO_T}yes (version $WX_VERSION)" >&6; } ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIBS_REQUIRED` { echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6; } ! WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $WXLIBS_REQUIRED 2>/dev/null` if test "x$WX_LIBS_STATIC" = "x"; then { echo "$as_me:$LINENO: result: no" >&5 *************** *** 4417,4421 **** if test "x$wx_has_cppflags" = x ; then ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` WX_CPPFLAGS=$WX_CFLAGS WX_CXXFLAGS=$WX_CFLAGS --- 4416,4420 ---- if test "x$wx_has_cppflags" = x ; then ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $WXLIBS_REQUIRED` WX_CPPFLAGS=$WX_CFLAGS WX_CXXFLAGS=$WX_CFLAGS *************** *** 4424,4430 **** WX_CXXFLAGS_ONLY=$WX_CFLAGS else ! WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags` ! WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags` ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` --- 4423,4429 ---- WX_CXXFLAGS_ONLY=$WX_CFLAGS else ! WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $WXLIBS_REQUIRED` ! WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $WXLIBS_REQUIRED` ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $WXLIBS_REQUIRED` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` *************** *** 4436,4445 **** else ! if test "x$WX_VERSION_FULL" = x; then { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } else ! { echo "$as_me:$LINENO: result: no (version $WX_VERSION_FULL is not new enough)" >&5 ! echo "${ECHO_T}no (version $WX_VERSION_FULL is not new enough)" >&6; } fi --- 4435,4444 ---- else ! if test "x$WX_VERSION" = x; then { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } else ! { echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 ! echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6; } fi *************** *** 4514,4523 **** { { echo "$as_me:$LINENO: error: Cannot detect the wxWidgets configuration for the selected wxWidgets build ! since its version is $WX_VERSION_FULL < 2.6.0; please install a newer version of wxWidgets. " >&5 echo "$as_me: error: Cannot detect the wxWidgets configuration for the selected wxWidgets build ! since its version is $WX_VERSION_FULL < 2.6.0; please install a newer version of wxWidgets. " >&2;} --- 4513,4522 ---- { { echo "$as_me:$LINENO: error: Cannot detect the wxWidgets configuration for the selected wxWidgets build ! since its version is $WX_VERSION < 2.6.0; please install a newer version of wxWidgets. " >&5 echo "$as_me: error: Cannot detect the wxWidgets configuration for the selected wxWidgets build ! since its version is $WX_VERSION < 2.6.0; please install a newer version of wxWidgets. " >&2;} *************** *** 7660,7664 **** # now that we know the wxWidgets' version, we can update the PACKAGE_VERSION var ! PACKAGE_VERSION="$WX_VERSION_FULL.$PACKAGE_VERSION" --- 7659,7663 ---- # now that we know the wxWidgets' version, we can update the PACKAGE_VERSION var ! PACKAGE_VERSION="$WX_VERSION.$PACKAGE_VERSION" *************** *** 11009,11013 **** WX_LIBS!$WX_LIBS$ac_delim WX_LIBS_STATIC!$WX_LIBS_STATIC$ac_delim ! WX_VERSION_FULL!$WX_VERSION_FULL$ac_delim WX_RESCOMP!$WX_RESCOMP$ac_delim WX_VERSION_MAJOR!$WX_VERSION_MAJOR$ac_delim --- 11008,11012 ---- WX_LIBS!$WX_LIBS$ac_delim WX_LIBS_STATIC!$WX_LIBS_STATIC$ac_delim ! WX_VERSION!$WX_VERSION$ac_delim WX_RESCOMP!$WX_RESCOMP$ac_delim WX_VERSION_MAJOR!$WX_VERSION_MAJOR$ac_delim *************** *** 11814,11818 **** echo " " ! # It is sometimes hard to dig out from the Makefiles these values echo " - wxLua complier and linker directives summary: " echo " CFLAGS : '$CFLAGS'" --- 11813,11818 ---- echo " " ! # It is sometimes hard to dig out these values from the Makefiles ! echo " - wxLua complier and linker directives summary: " echo " CFLAGS : '$CFLAGS'" *************** *** 11825,11833 **** echo " " ! echo " - wxLua path settings:" echo " prefix : '$prefix'" echo " exec_prefix : '$exec_prefix'" - echo " INSTALL : '$INSTALL'" - echo " top_srcdir : '$top_srcdir'" echo " libdir : '$libdir'" echo " datadir : '$datadir'" --- 11825,11831 ---- echo " " ! echo " - wxLua make install path settings:" echo " prefix : '$prefix'" echo " exec_prefix : '$exec_prefix'" echo " libdir : '$libdir'" echo " datadir : '$datadir'" *************** *** 11874,11878 **** fi ! echo " - VERSION: $WX_VERSION_FULL" echo " - PORT: $WX_PORT" --- 11872,11876 ---- fi ! echo " - VERSION: $WX_VERSION" echo " - PORT: $WX_PORT" |
|
From: Francesco M. <fr...@us...> - 2008-01-12 09:58:51
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24693/build/autoconf Modified Files: aclocal.m4 configure.ac wxwin.m4 Log Message: updated the wxwin.m4 from wxTRUNK, so that it works also with newer (2.9) wx-config scripts Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** aclocal.m4 10 Jan 2008 00:25:16 -0000 1.50 --- aclocal.m4 12 Jan 2008 09:58:46 -0000 1.51 *************** *** 1,6 **** ! # generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** configure.ac 11 Jan 2008 23:39:05 -0000 1.51 --- configure.ac 12 Jan 2008 09:58:46 -0000 1.52 *************** *** 897,901 **** # now that we know the wxWidgets' version, we can update the PACKAGE_VERSION var ! PACKAGE_VERSION="$WX_VERSION_FULL.$PACKAGE_VERSION" --- 897,901 ---- # now that we know the wxWidgets' version, we can update the PACKAGE_VERSION var ! PACKAGE_VERSION="$WX_VERSION.$PACKAGE_VERSION" Index: wxwin.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxwin.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxwin.m4 27 Jul 2007 13:33:41 -0000 1.1 --- wxwin.m4 12 Jan 2008 09:58:46 -0000 1.2 *************** *** 8,12 **** dnl =========================================================================== ! dnl Table of Contents of this macro dnl ------------------------------------- dnl --- 8,12 ---- dnl =========================================================================== ! dnl Table of Contents of this macro file: dnl ------------------------------------- dnl *************** *** 123,127 **** [ wx_ver_ok="" ! if test "x$WX_VERSION_FULL" != x ; then if test $wx_config_major_version -gt $1; then wx_ver_ok=yes --- 123,127 ---- [ wx_ver_ok="" ! if test "x$WX_VERSION" != x ; then if test $wx_config_major_version -gt $1; then wx_ver_ok=yes *************** *** 203,207 **** if test "$WX_CONFIG_PATH" != "no" ; then ! WX_VERSION_FULL="" min_wx_version=ifelse([$1], ,2.2.1,$1) --- 203,207 ---- if test "$WX_CONFIG_PATH" != "no" ; then ! WX_VERSION="" min_wx_version=ifelse([$1], ,2.2.1,$1) *************** *** 212,223 **** fi ! WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4" ! WX_VERSION_FULL=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` ! wx_config_major_version=`echo $WX_VERSION_FULL | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ! wx_config_minor_version=`echo $WX_VERSION_FULL | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ! wx_config_micro_version=`echo $WX_VERSION_FULL | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` --- 212,225 ---- fi ! dnl don't add the libraries ($4) to this variable as this would result in ! dnl an error when it's used with --version below ! WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5" ! WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` ! wx_config_major_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ! wx_config_minor_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ! wx_config_micro_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` *************** *** 234,240 **** if test -n "$wx_ver_ok"; then ! ! AC_MSG_RESULT(yes (version $WX_VERSION_FULL)) ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs` dnl is this even still appropriate? --static is a real option now --- 236,241 ---- if test -n "$wx_ver_ok"; then ! AC_MSG_RESULT(yes (version $WX_VERSION)) ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4` dnl is this even still appropriate? --static is a real option now *************** *** 243,247 **** dnl For now keep it in case anyone actually used it in the past. AC_MSG_CHECKING([for wxWidgets static library]) ! WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null` if test "x$WX_LIBS_STATIC" = "x"; then AC_MSG_RESULT(no) --- 244,248 ---- dnl For now keep it in case anyone actually used it in the past. AC_MSG_CHECKING([for wxWidgets static library]) ! WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null` if test "x$WX_LIBS_STATIC" = "x"; then AC_MSG_RESULT(no) *************** *** 288,292 **** if test "x$wx_has_cppflags" = x ; then dnl no choice but to define all flags like CFLAGS ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` WX_CPPFLAGS=$WX_CFLAGS WX_CXXFLAGS=$WX_CFLAGS --- 289,293 ---- if test "x$wx_has_cppflags" = x ; then dnl no choice but to define all flags like CFLAGS ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4` WX_CPPFLAGS=$WX_CFLAGS WX_CXXFLAGS=$WX_CFLAGS *************** *** 296,302 **** else dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS ! WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags` ! WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags` ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` --- 297,303 ---- else dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS ! WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4` ! WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4` ! WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` *************** *** 308,316 **** else ! if test "x$WX_VERSION_FULL" = x; then dnl no wx-config at all AC_MSG_RESULT(no) else ! AC_MSG_RESULT(no (version $WX_VERSION_FULL is not new enough)) fi --- 309,317 ---- else ! if test "x$WX_VERSION" = x; then dnl no wx-config at all AC_MSG_RESULT(no) else ! AC_MSG_RESULT(no (version $WX_VERSION is not new enough)) fi *************** *** 369,373 **** AC_SUBST(WX_LIBS) AC_SUBST(WX_LIBS_STATIC) ! AC_SUBST(WX_VERSION_FULL) AC_SUBST(WX_RESCOMP) --- 370,374 ---- AC_SUBST(WX_LIBS) AC_SUBST(WX_LIBS_STATIC) ! AC_SUBST(WX_VERSION) AC_SUBST(WX_RESCOMP) *************** *** 572,576 **** dnl the $1 argument contains respectively the debug,unicode or shared options. ! ifelse(index([$1], [debug]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])]) --- 573,578 ---- dnl the $1 argument contains respectively the debug,unicode or shared options. ! dnl be careful here not to set debug flag if only "wxdebug" was specified ! ifelse(regexp([$1], [\bdebug]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])]) *************** *** 578,582 **** [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])]) ! ifelse(index([$1], [shared]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])]) --- 580,584 ---- [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])]) ! ifelse(regexp([$1], [\bshared]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])]) *************** *** 804,808 **** AC_MSG_ERROR([ Cannot detect the wxWidgets configuration for the selected wxWidgets build ! since its version is $WX_VERSION_FULL < 2.6.0; please install a newer version of wxWidgets. ]) --- 806,810 ---- AC_MSG_ERROR([ Cannot detect the wxWidgets configuration for the selected wxWidgets build ! since its version is $WX_VERSION < 2.6.0; please install a newer version of wxWidgets. ]) *************** *** 998,1002 **** WX_BOOLOPT_SUMMARY([WX_UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) WX_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"]) ! echo " - VERSION: $WX_VERSION_FULL" echo " - PORT: $WX_PORT" ]) --- 1000,1004 ---- WX_BOOLOPT_SUMMARY([WX_UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) WX_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"]) ! echo " - VERSION: $WX_VERSION" echo " - PORT: $WX_PORT" ]) *************** *** 1048,1050 **** - --- 1050,1051 ---- |
|
From: John L. <jr...@us...> - 2008-01-11 23:39:10
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13009/wxLua/build/autoconf Modified Files: configure.ac Log Message: Make configure even more verbose. Add more install docs Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** configure.ac 11 Jan 2008 22:20:47 -0000 1.50 --- configure.ac 11 Jan 2008 23:39:05 -0000 1.51 *************** *** 852,869 **** AC_ADD_WXLUA_LIBS([$USE_WXBINDXRC], [wxbindxrc]) - # It is sometimes hard to dig out from the Makefiles these values - AC_MSG_NOTICE([ - Complier and linker directives summary. - - CFLAGS : '$CFLAGS' - CXXFLAGS : '$CXXFLAGS' - CPPFLAGS : '$CPPFLAGS' - WX_CXXFLAGS : '$WX_CXXFLAGS' - LDFLAGS : '$LDFLAGS' - WX_LIBS : '$WX_LIBS' - WXLUA_LIBS : '$WXLUA_LIBS' - - ]) - AC_SUBST([WXLUA_LIBS]) --- 852,855 ---- *************** *** 1040,1048 **** [" - install custom wxBind stuff: no"]) ! echo " - wxBind modules enabled: " echo " $wxbind_list_enabled" ! echo " - wxBind modules that will be created: " echo " $WXLIB_NAMES" WX_STANDARD_OPTIONS_SUMMARY_MSG_END --- 1026,1063 ---- [" - install custom wxBind stuff: no"]) ! echo " " ! echo " - wxBind modules desired by configure options: " echo " $wxbind_list_enabled" ! echo " - wxBind modules that will be created satisfying dependencies: " echo " $WXLIB_NAMES" + echo " " + + # It is sometimes hard to dig out these values from the Makefiles + + echo " - wxLua complier and linker directives summary: " + echo " CFLAGS : '$CFLAGS'" + echo " CXXFLAGS : '$CXXFLAGS'" + echo " CPPFLAGS : '$CPPFLAGS'" + echo " WX_CXXFLAGS : '$WX_CXXFLAGS'" + echo " LDFLAGS : '$LDFLAGS'" + echo " WX_LIBS : '$WX_LIBS'" + echo " WXLUA_LIBS : '$WXLUA_LIBS'" + echo " " + + echo " - wxLua make install path settings:" + echo " prefix : '$prefix'" + echo " exec_prefix : '$exec_prefix'" + echo " libdir : '$libdir'" + echo " datadir : '$datadir'" + echo " " + + echo " - wxWidgets library information summary: " + echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" + echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" + echo " wx-config --selected-config : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --selected-config`'" + echo " wx-config --prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --prefix`'" + echo " wx-config --exec-prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --exec-prefix`'" + echo " " WX_STANDARD_OPTIONS_SUMMARY_MSG_END |
|
From: John L. <jr...@us...> - 2008-01-11 23:39:10
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13009/wxLua/docs Modified Files: install.html Log Message: Make configure even more verbose. Add more install docs Index: install.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/install.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** install.html 11 Jan 2008 22:20:47 -0000 1.12 --- install.html 11 Jan 2008 23:39:05 -0000 1.13 *************** *** 6,10 **** <meta content="Info about building wxLua" name="description"> </head> - <body> <u><b><big><big>wxLua - installation guide</big></big></b></u><br> --- 6,9 ---- *************** *** 12,16 **** This document describes how to build wxLua for use as an interpreter of lua scripts and for embedding wxLua in a C++ project. ! You can build wxLua in many ways:<br> <ol> <li> --- 11,17 ---- This document describes how to build wxLua for use as an interpreter of lua scripts and for embedding wxLua in a C++ project. ! You can build wxLua on many platforms with a variety of compilers. All ! the build settings and platforms that are supported by wxWidgets are ! supported by wxLua. <br> <ol> <li> *************** *** 129,137 **** </span>(version 1.2.4 or higher) if you want to compile the <span style="font-family: monospace;">wxluaedit</span> application.</p> ! <p style="text-align: justify;"><span style="font-weight: bold;">VERY IMPORTANT: ! all instructions below suppose that you already compiled and installed ! wxWidgets (refer to wxWidgets documentation for this). If you want to ! use a precompiled package you must install the development ! package as well as the runtime package.</span></p> <p style="text-align: justify;"><span style="font-weight: bold;">wxSTC</span> is the wxWidgets wrapper around the Scintilla text control and can be --- 130,148 ---- </span>(version 1.2.4 or higher) if you want to compile the <span style="font-family: monospace;">wxluaedit</span> application.</p> ! <p style="text-align: justify;"><span style="font-weight: bold;">VERY IMPORTANT: </span></p> ! <ul> ! <li><span style="font-weight: bold;">All ! instructions below suppose that you already compiled ! or installed a working development version of ! wxWidgets. Please refer to wxWidgets documentation for this.</span></li> ! <li><span style="font-weight: bold;">If you want ! to ! use a precompiled package of wxWidgets you must install the ! development as well as the runtime package. </span></li> ! <li><span style="font-weight: bold;">You should be ! able to compile and successfully run the wxWidgets samples, please try ! at least one before attempting to compile wxLua to verify that ! wxWidgets is correctly installed before continuing.</span></li> ! </ul> <p style="text-align: justify;"><span style="font-weight: bold;">wxSTC</span> is the wxWidgets wrapper around the Scintilla text control and can be *************** *** 334,337 **** --- 345,352 ---- directory to the wxStEdit library is specified by $(WXSTEDIT).</li> </ul> + You can set these environment variables in MS Windows either at the DOS + prompt using "set WXWIN=\path\to\wxWidgets" or by right clicking on "My + Computer" -> "System" -> "Environment + Variables" and add it for yourself or for everyone. </div> <p style="text-align: justify;">Note that the <span style="font-family: monospace;">USE_WXLUAEDITAPP </span>option *************** *** 355,359 **** Open the <span style="font-family: monospace;">wxLua/build/msw/wxLua.dsw</span> project file and select the same configuration you used to ! build wxWidgets from the <span style="font-family: monospace;">"Build->Set Active Project"</span> menu.</div> <p> --- 370,375 ---- Open the <span style="font-family: monospace;">wxLua/build/msw/wxLua.dsw</span> project file and select the same configuration you used to ! build wxWidgets from the <span style="font-family: monospace;">"Build->Set ! Active Project"</span> menu.</div> <p> *************** *** 367,377 **** targets. You may also use "Batch Build" to build multiple libraries and programs at once.</p> <u><b><big><big><br> <a name="unix"></a>4. Building on Linux/Unix</big></big></b></u><br> ! <p>Quick guide: just move to the root directory of the wxLua project and type:</p> <p style="margin-left: 40px; font-family: monospace;">./configure && make</p> ! to build using the wxWidgets default build and then execute, with <span style="font-family: monospace;">root</span> permissions (you can use <span style="font-family: monospace;">su</span> or <span style="font-family: monospace;">sudo</span> --- 383,401 ---- targets. You may also use "Batch Build" to build multiple libraries and programs at once.</p> + <p>In order to compile the wxLuaEdit application you must compile + the wxStEdit library by using its project file with the same settings + that you will use for wxLua. Then set the environment variable + WXSTEDIT=/path/to/wxstedit by right clicking on "My Computer" -> + "System" -> "Environment Variables" and add it for yourself or + for everyone. You will have to close and reopen MS Visual Studio in + order for the new variable to be used.</p> <u><b><big><big><br> <a name="unix"></a>4. Building on Linux/Unix</big></big></b></u><br> ! <p>Quickstart: Move to the root directory of the wxLua project and type:</p> <p style="margin-left: 40px; font-family: monospace;">./configure && make</p> ! to build using the wxWidgets default build settings and then execute, ! with <span style="font-family: monospace;">root</span> permissions (you can use <span style="font-family: monospace;">su</span> or <span style="font-family: monospace;">sudo</span> *************** *** 385,395 **** Note that <span style="font-family: monospace;">--enable-XXX</span> or <span style="font-family: monospace;">--enable-XXX=yes</span> ! enables the option <span style="font-family: monospace;"></span>and <span style="font-family: monospace;">--disable-XXX</span> or <span style="font-family: monospace;">--enable-debug=no</span> ! disable it.<br> <br> wxLua's <span style="font-family: monospace;">configure</span> tries to determine the wxWidgets build settings automatically ! using <span style="font-family: monospace;">wx-config</span>, ! but if you have multiple wxWidgets builds (you can list them using <span style="font-family: monospace;">wx-config --list</span>) you can select the build you want using the <span style="font-family: monospace;">--enable-unicode</span>, <span style="font-family: monospace;">--enable-debug</span> --- 409,423 ---- Note that <span style="font-family: monospace;">--enable-XXX</span> or <span style="font-family: monospace;">--enable-XXX=yes</span> ! enables the option <span style="font-family: monospace;"></span>and ! <span style="font-family: monospace;">--disable-XXX</span> ! or <span style="font-family: monospace;">--enable-XXX=no</span> ! disables it.<br> <br> wxLua's <span style="font-family: monospace;">configure</span> tries to determine the wxWidgets build settings automatically ! using the <span style="font-family: monospace;">wx-config</span> ! script, ! but if you have multiple wxWidgets builds (you can list them using <span style="font-family: monospace;">wx-config --list</span>) ! you can select the build you want using the <span style="font-family: monospace;">--enable-unicode</span>, <span style="font-family: monospace;">--enable-debug</span> *************** *** 400,413 **** options only if you had built wxWidgets with them. The build settings for wxLua must be identical to the ones used by ! wxWidgets. I.e. you cannot build wxLua in ANSI mode and try to link to a Unicode build of wxWidgets! ! <br> ! <br> ! E.g. if you have a unicode, release, shared library (as opposed to static) build of wxWidgets and want to build wxLua in unicode, release, static mode, then you can do:<br> <br> ! <span style="font-family: monospace;">./configure --enable-unicode --disable-debug --disable-shared --with-wxshared</span><br> <br> --- 428,441 ---- options only if you had built wxWidgets with them. The build settings for wxLua must be identical to the ones used by ! wxWidgets, i.e. you cannot build wxLua in ANSI mode and try to link to a Unicode build of wxWidgets! ! For example, if you have a unicode, release, shared library ! (as opposed to static) build of wxWidgets and want to build wxLua in unicode, release, static mode, then you can do:<br> <br> ! <span style="font-family: monospace;">./configure ! --enable-unicode --disable-debug --disable-shared --with-wxshared</span><br> <br> *************** *** 420,427 **** The options <span style="font-family: monospace;">--enable-wxbindstc</span>, <span style="font-family: monospace;">--enable-wxluadebug</span>, ! <span style="font-family: monospace;">--enable-wxluasocket</span> let you to enable or disable compiling the wxLua <span style="font-weight: bold;">modules</span>.<br> <br> ! It is useful to know that you can compile multiple coexisting wxLua builds by running wxLua's configure script in --- 448,456 ---- The options <span style="font-family: monospace;">--enable-wxbindstc</span>, <span style="font-family: monospace;">--enable-wxluadebug</span>, ! <span style="font-family: monospace;">--enable-wxluasocket</span> ! let you to enable or disable compiling the wxLua <span style="font-weight: bold;">modules</span>.<br> <br> ! You can compile multiple coexisting wxLua builds by running wxLua's configure script in *************** *** 447,450 **** --- 476,493 ---- override the variables existing value so you may want to instead do <span style="font-family: monospace;">export LD_LIBRARY_PATH=$</span><span style="font-family: monospace;">LD_LIBRARY_PATH:</span><span style="font-family: monospace;">/path/to/wxLua/lib</span>.<br> <br> + The wxLuaEdit application depends on the wxStEdit library that you + should have compiled before trying to compile wxLua. There are two ways + to let wxLua's configure find the wxStEdit library: 1) Set the shell + environment variable before running configure <span style="font-family: monospace;">export + WXSTEDIT=/path/to/wxstedit</span> or 2) Use the <span style="font-family: monospace;">--with-wxstedit-prefix=/path/to/wxstedit</span> + configure directive. As a last resort you can help wxLua's + configure find wxStEdit or its libraries by exporting + these environment variables:<br> + <br> + <span style="font-family: monospace;">export + CPPFLAGS="-I/path/to/wxstedit/include" </span><br> + <span style="font-family: monospace;">export + LDFLAGS="-L/path/to/wxstedit/lib"</span><br> + <br> Other useful targets which you can use are:<br> <ul> *************** *** 480,484 **** The bindings in <span style="font-family: monospace;">modules/wxbind</span> contain nearly all of the classes and functions in wxWidgets. They also ! contain the appropriate <span style="font-family: monospace;">#if wxUSE_XXX</span> statements and platform dependent <span style="font-family: monospace;">__WXMSW/GTK/MAC__</span> checks that wxWidgets uses in its headers to ensure that no matter what --- 523,528 ---- The bindings in <span style="font-family: monospace;">modules/wxbind</span> contain nearly all of the classes and functions in wxWidgets. They also ! contain the appropriate <span style="font-family: monospace;">#if ! wxUSE_XXX</span> statements and platform dependent <span style="font-family: monospace;">__WXMSW/GTK/MAC__</span> checks that wxWidgets uses in its headers to ensure that no matter what |
|
From: John L. <jr...@us...> - 2008-01-11 23:39:08
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13009/wxLua Modified Files: configure Log Message: Make configure even more verbose. Add more install docs Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** configure 11 Jan 2008 22:20:47 -0000 1.62 --- configure 11 Jan 2008 23:39:04 -0000 1.63 *************** *** 7523,7552 **** - # It is sometimes hard to dig out from the Makefiles these values - { echo "$as_me:$LINENO: - Complier and linker directives summary. - - CFLAGS : '$CFLAGS' - CXXFLAGS : '$CXXFLAGS' - CPPFLAGS : '$CPPFLAGS' - WX_CXXFLAGS : '$WX_CXXFLAGS' - LDFLAGS : '$LDFLAGS' - WX_LIBS : '$WX_LIBS' - WXLUA_LIBS : '$WXLUA_LIBS' - - " >&5 - echo "$as_me: - Complier and linker directives summary. - - CFLAGS : '$CFLAGS' - CXXFLAGS : '$CXXFLAGS' - CPPFLAGS : '$CPPFLAGS' - WX_CXXFLAGS : '$WX_CXXFLAGS' - LDFLAGS : '$LDFLAGS' - WX_LIBS : '$WX_LIBS' - WXLUA_LIBS : '$WXLUA_LIBS' - - " >&6;} - --- 7523,7526 ---- *************** *** 11832,11840 **** ! echo " - wxBind modules enabled: " echo " $wxbind_list_enabled" ! echo " - wxBind modules that will be created: " echo " $WXLIB_NAMES" --- 11806,11844 ---- ! echo " " ! echo " - wxBind modules desired by configure options: " echo " $wxbind_list_enabled" ! echo " - wxBind modules that will be created satisfying dependencies: " echo " $WXLIB_NAMES" + echo " " + + # It is sometimes hard to dig out from the Makefiles these values + echo " - wxLua complier and linker directives summary: " + echo " CFLAGS : '$CFLAGS'" + echo " CXXFLAGS : '$CXXFLAGS'" + echo " CPPFLAGS : '$CPPFLAGS'" + echo " WX_CXXFLAGS : '$WX_CXXFLAGS'" + echo " LDFLAGS : '$LDFLAGS'" + echo " WX_LIBS : '$WX_LIBS'" + echo " WXLUA_LIBS : '$WXLUA_LIBS'" + echo " " + + echo " - wxLua path settings:" + echo " prefix : '$prefix'" + echo " exec_prefix : '$exec_prefix'" + echo " INSTALL : '$INSTALL'" + echo " top_srcdir : '$top_srcdir'" + echo " libdir : '$libdir'" + echo " datadir : '$datadir'" + echo " " + + echo " - wxWidgets library information summary: " + echo " wx-config --release : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --release`'" + echo " wx-config --version-full : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --version-full`'" + echo " wx-config --selected-config : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --selected-config`'" + echo " wx-config --prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --prefix`'" + echo " wx-config --exec-prefix : '`$WX_CONFIG_NAME $WXCONFIG_FLAGS --exec-prefix`'" + echo " " |
|
From: John L. <jr...@us...> - 2008-01-11 22:20:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14047/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Update install.html Fix accidental paste so configure was broken Move wxLUA_USEBINDING_XXX to wxbinddefs.h from wxluasetup.h so we don't have to specify the include for wxluasetup and since wxLUA_USEBINDING_XXX is used only for the WXLUA_DECLARE/IMPLEMENT/_BIND_XXX Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxluasetup.h 10 Jan 2008 23:06:27 -0000 1.21 --- wxluasetup.h 11 Jan 2008 22:20:47 -0000 1.22 *************** *** 12,64 **** #define __WXLUA_SETUP__ - // Enable or disable the wxLua bindings based on the libs - - #ifndef wxLUA_USEBINDING_WXLUA - #define wxLUA_USEBINDING_WXLUA 1 - #endif - #ifndef wxLUA_USEBINDING_WXLUASOCKET - #define wxLUA_USEBINDING_WXLUASOCKET 1 - #endif ! // Enable or disable whole wxWidgets bindings based on the libs ! #ifndef wxLUA_USEBINDING_WXADV ! #define wxLUA_USEBINDING_WXADV 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXAUI ! #define wxLUA_USEBINDING_WXAUI 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXBASE ! #define wxLUA_USEBINDING_WXBASE 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXCORE ! #define wxLUA_USEBINDING_WXCORE 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXGL ! #define wxLUA_USEBINDING_WXGL 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXHTML ! #define wxLUA_USEBINDING_WXHTML 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXMEDIA ! #define wxLUA_USEBINDING_WXMEDIA 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXNET ! #define wxLUA_USEBINDING_WXNET 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXRICHTEXT ! #define wxLUA_USEBINDING_WXRICHTEXT 0 ! #endif ! #ifndef wxLUA_USEBINDING_WXSTC ! #define wxLUA_USEBINDING_WXSTC 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXXML ! #define wxLUA_USEBINDING_WXXML 1 ! #endif ! #ifndef wxLUA_USEBINDING_WXXRC ! #define wxLUA_USEBINDING_WXXRC 1 ! #endif - // Enable or disable single or small groups of classes, see bindings/*.i #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 --- 12,23 ---- #define __WXLUA_SETUP__ ! // Enable or disable single or small groups of classes, see bindings/*.i ! // This file is separate from the wxbind includes to allow you to modify it ! // or put a -Iother/path/to/wxluasetup/ to allow your own wxluasetup file ! // to be included since wxLua only includes it as "#include "wxluasetup.h" ! // without any path. #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 *************** *** 165,169 **** #define wxLUA_USE_wxRegion 1 #define wxLUA_USE_wxRenderer 1 ! #define wxLUA_USE_wxRichText 0 #define wxLUA_USE_wxSashWindow 1 #define wxLUA_USE_wxScrollBar 1 --- 124,128 ---- #define wxLUA_USE_wxRegion 1 #define wxLUA_USE_wxRenderer 1 ! #define wxLUA_USE_wxRichText 0 // NOT FINISHED or WORKING #define wxLUA_USE_wxSashWindow 1 #define wxLUA_USE_wxScrollBar 1 |
|
From: John L. <jr...@us...> - 2008-01-11 22:20:52
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14047/wxLua/build/autoconf Modified Files: configure.ac Log Message: Update install.html Fix accidental paste so configure was broken Move wxLUA_USEBINDING_XXX to wxbinddefs.h from wxluasetup.h so we don't have to specify the include for wxluasetup and since wxLUA_USEBINDING_XXX is used only for the WXLUA_DECLARE/IMPLEMENT/_BIND_XXX Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** configure.ac 11 Jan 2008 17:22:37 -0000 1.49 --- configure.ac 11 Jan 2008 22:20:47 -0000 1.50 *************** *** 819,824 **** dnl --------------------------------------------------------------------------- ! # recreate the wx-config --libs after determining whacvs -z3 -d:ext:jr...@wx...:/cvsroot/wxlua diff wxLua ! t libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` --- 819,823 ---- dnl --------------------------------------------------------------------------- ! # recreate the wx-config --libs after determining what libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` |
|
From: John L. <jr...@us...> - 2008-01-11 22:20:52
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14047/wxLua/docs Modified Files: install.html Log Message: Update install.html Fix accidental paste so configure was broken Move wxLUA_USEBINDING_XXX to wxbinddefs.h from wxluasetup.h so we don't have to specify the include for wxluasetup and since wxLUA_USEBINDING_XXX is used only for the WXLUA_DECLARE/IMPLEMENT/_BIND_XXX Index: install.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/install.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** install.html 8 Dec 2006 23:12:15 -0000 1.11 --- install.html 11 Jan 2008 22:20:47 -0000 1.12 *************** *** 1,86 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html> ! <head> ! ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> ! <title>wxLua Installation Guide</title> ! ! ! <meta content="Francesco Montorsi, John Labenski" name="author"> ! [...1325 lines suppressed...] </div> <br> Obviously you should remove the libraries you don't use (e.g. wxluasocket, wxluadebug) and use the decorated names for the others. The wxLua makefiles/IDE outputs the libraries following the same wxWidgets naming rule:<br> <br> <div style="text-align: center;"><span style="font-family: monospace;">wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</span><br> </div> <br> where <span style="font-family: monospace;">WX_PORT_WITHVERSION</span> can be <span style="font-family: monospace;">gtk2</span>, <span style="font-family: monospace;">msw</span>, <span style="font-family: monospace;">x11</span>, etc; <span style="font-family: monospace;">WXLIBPOSTFIX </span>can be <span style="font-family: monospace;">u</span>, <span style="font-family: monospace;">d</span>, <span style="font-family: monospace;">ud</span>.<br> </div> <br> <hr style="width: 100%; height: 2px;"><br> $Id$ ! </body></html> \ No newline at end of file |
|
From: John L. <jr...@us...> - 2008-01-11 22:20:52
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14047/wxLua Modified Files: configure Log Message: Update install.html Fix accidental paste so configure was broken Move wxLUA_USEBINDING_XXX to wxbinddefs.h from wxluasetup.h so we don't have to specify the include for wxluasetup and since wxLUA_USEBINDING_XXX is used only for the WXLUA_DECLARE/IMPLEMENT/_BIND_XXX Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** configure 11 Jan 2008 17:22:37 -0000 1.61 --- configure 11 Jan 2008 22:20:47 -0000 1.62 *************** *** 7198,7203 **** ! # recreate the wx-config --libs after determining whacvs -z3 -d:ext:jr...@wx...:/cvsroot/wxlua diff wxLua ! t libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` --- 7198,7202 ---- ! # recreate the wx-config --libs after determining what libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` |
|
From: John L. <jr...@us...> - 2008-01-11 22:20:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14047/wxLua/modules/wxbind/include Modified Files: wxbinddefs.h Log Message: Update install.html Fix accidental paste so configure was broken Move wxLUA_USEBINDING_XXX to wxbinddefs.h from wxluasetup.h so we don't have to specify the include for wxluasetup and since wxLUA_USEBINDING_XXX is used only for the WXLUA_DECLARE/IMPLEMENT/_BIND_XXX Index: wxbinddefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxbinddefs.h 11 Jan 2008 00:32:36 -0000 1.10 --- wxbinddefs.h 11 Jan 2008 22:20:47 -0000 1.11 *************** *** 13,17 **** #include "wx/defs.h" #include "wxlua/include/wxlstate.h" - #include "../setup/wxluasetup.h" // ---------------------------------------------------------------------------- --- 13,16 ---- *************** *** 169,172 **** --- 168,229 ---- // ---------------------------------------------------------------------------- + // wxLUA_USEBINDING_XXX defines control the WXLUA_DECLARE_BIND_XXX and + // WXLUA_IMPLEMENT_BIND_XXX macros to allow the wxLuaBinding_XXX_init() + // functions to be called or not depending on the existence of the bind libs. + // + // Normally =1, but they are overridden by autoconf (configure) to 0 using + // the compiler directive -DwxLUA_USEBINDING_XXX=0 if the corresponding + // wxWidgets library is not found. + // ---------------------------------------------------------------------------- + + // Enable or disable initializing the wxLua bindings + + #ifndef wxLUA_USEBINDING_WXLUA + #define wxLUA_USEBINDING_WXLUA 1 + #endif + #ifndef wxLUA_USEBINDING_WXLUASOCKET + #define wxLUA_USEBINDING_WXLUASOCKET 1 + #endif + + // Enable or disable initializing the wxWidgets bindings + + #ifndef wxLUA_USEBINDING_WXADV + #define wxLUA_USEBINDING_WXADV 1 + #endif + #ifndef wxLUA_USEBINDING_WXAUI + #define wxLUA_USEBINDING_WXAUI 1 + #endif + #ifndef wxLUA_USEBINDING_WXBASE + #define wxLUA_USEBINDING_WXBASE 1 + #endif + #ifndef wxLUA_USEBINDING_WXCORE + #define wxLUA_USEBINDING_WXCORE 1 + #endif + #ifndef wxLUA_USEBINDING_WXGL + #define wxLUA_USEBINDING_WXGL 1 + #endif + #ifndef wxLUA_USEBINDING_WXHTML + #define wxLUA_USEBINDING_WXHTML 1 + #endif + #ifndef wxLUA_USEBINDING_WXMEDIA + #define wxLUA_USEBINDING_WXMEDIA 1 + #endif + #ifndef wxLUA_USEBINDING_WXNET + #define wxLUA_USEBINDING_WXNET 1 + #endif + #ifndef wxLUA_USEBINDING_WXRICHTEXT + #define wxLUA_USEBINDING_WXRICHTEXT 0 // NOT FINISHED or WORKING + #endif + #ifndef wxLUA_USEBINDING_WXSTC + #define wxLUA_USEBINDING_WXSTC 1 + #endif + #ifndef wxLUA_USEBINDING_WXXML + #define wxLUA_USEBINDING_WXXML 1 + #endif + #ifndef wxLUA_USEBINDING_WXXRC + #define wxLUA_USEBINDING_WXXRC 1 + #endif + + // ---------------------------------------------------------------------------- // Macros to initialize the wxWidgets bindings taking the wxUSE_XXX conditions // into account. |
|
From: John L. <jr...@us...> - 2008-01-11 17:22:43
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27705/wxLua Modified Files: configure Log Message: Use wx-config for the LIBS in the configure checks for adv,aui, etc so that we work with shared and static libraries. Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** configure 10 Jan 2008 23:06:23 -0000 1.60 --- configure 11 Jan 2008 17:22:37 -0000 1.61 *************** *** 2784,2788 **** ! WXLIB_NAMES="net,xml,core,base" WXLUA_LIBS="-llua5.1" --- 2784,2788 ---- ! WXLIB_NAMES="core,base" WXLUA_LIBS="-llua5.1" *************** *** 6101,6122 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""adv""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_ADV_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets Adv bindings are available" >&5 --- 6101,6111 ---- + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! #WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) ! #LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs adv` { echo "$as_me:$LINENO: checking if wxWidgets Adv bindings are available" >&5 *************** *** 6186,6189 **** --- 6175,6180 ---- if [[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]; then + + # add adv to the list of wx-config --libs WXLIB_NAMES="adv,$WXLIB_NAMES" *************** *** 6206,6225 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""aui""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_AUI_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_AUI_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets AUI bindings are available" >&5 --- 6197,6201 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs aui` { echo "$as_me:$LINENO: checking if wxWidgets AUI bindings are available" >&5 *************** *** 6309,6328 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""gl""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_GL_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets OpenGL bindings are available" >&5 --- 6285,6289 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs gl` { echo "$as_me:$LINENO: checking if wxWidgets OpenGL bindings are available" >&5 *************** *** 6412,6431 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""html""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_HTML_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_HTML_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets HTML bindings are available" >&5 --- 6373,6377 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs html` { echo "$as_me:$LINENO: checking if wxWidgets HTML bindings are available" >&5 *************** *** 6515,6534 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""media""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_MEDIA_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_MEDIA_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets Media bindings are available" >&5 --- 6461,6465 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs media` { echo "$as_me:$LINENO: checking if wxWidgets Media bindings are available" >&5 *************** *** 6610,6617 **** - - - - SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CXXFLAGS="$CXXFLAGS" --- 6541,6544 ---- *************** *** 6622,6641 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! wx_temp="wx""_""$WX_PORT" ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! wx_temp="$wx_temp""_""richtext""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _WX_RICHTEXT_LIBNAME=$wx_temp ! LIBS="$LIBS -l$_WX_RICHTEXT_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets Richtext bindings are available" >&5 --- 6549,6641 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs net` + { echo "$as_me:$LINENO: checking if wxWidgets Net bindings are available" >&5 + echo $ECHO_N "checking if wxWidgets Net bindings are available... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #include <wx/socket.h> ! int ! main () ! { ! wxSocketClient dummy; ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (ac_try="$ac_link" ! case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ! (eval "$ac_link") 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && { ! test -z "$ac_cxx_werror_flag" || ! test ! -s conftest.err ! } && test -s conftest$ac_exeext && ! $as_test_x conftest$ac_exeext; then ! WXNET_PRESENCE=1 ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! WXNET_PRESENCE=0 ! fi ! rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ! conftest$ac_exeext conftest.$ac_ext ! if test "$WXNET_PRESENCE" = "1"; then ! { echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6; } ! ! else ! { echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6; } ! ! fi ! ! ! CPPFLAGS="$SAVED_CPPFLAGS" ! CXXFLAGS="$SAVED_CXXFLAGS" ! CFLAGS="$SAVED_CFLAGS" ! LIBS="$SAVED_LIBS" ! ! ! if test "$WXNET_PRESENCE" = "1"; then ! # add net to the list of wx-config --libs ! WXLIB_NAMES="net,$WXLIB_NAMES" ! else ! USE_WXBINDNET=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0" ! fi ! ! ! ! ! ! ! SAVED_CPPFLAGS="$CPPFLAGS" ! SAVED_CXXFLAGS="$CXXFLAGS" ! SAVED_CFLAGS="$CFLAGS" ! SAVED_LIBS="$LIBS" ! ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs richtext` { echo "$as_me:$LINENO: checking if wxWidgets Richtext bindings are available" >&5 *************** *** 6717,6724 **** - - - - SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CXXFLAGS="$CXXFLAGS" --- 6717,6720 ---- *************** *** 6729,6748 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! wx_temp="wx""_""$WX_PORT" - if test "$WX_UNICODE" = "1"; then - wx_temp="$wx_temp""u" - fi - if test "$WX_DEBUG" = "1"; then - wx_temp="$wx_temp""d" - fi - wx_temp="$wx_temp""_""xrc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" - _WX_XRC_LIBNAME=$wx_temp ! LIBS="$LIBS -l$_WX_XRC_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets XRC bindings are available" >&5 --- 6725,6817 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xml` + { echo "$as_me:$LINENO: checking if wxWidgets XML bindings are available" >&5 + echo $ECHO_N "checking if wxWidgets XML bindings are available... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #include <wx/xml/xml.h> ! int ! main () ! { ! wxXmlProperty dummy; ! ; ! return 0; ! } ! ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (ac_try="$ac_link" ! case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ! (eval "$ac_link") 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && { ! test -z "$ac_cxx_werror_flag" || ! test ! -s conftest.err ! } && test -s conftest$ac_exeext && ! $as_test_x conftest$ac_exeext; then ! WXXML_PRESENCE=1 ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! WXXML_PRESENCE=0 ! fi ! ! rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ! conftest$ac_exeext conftest.$ac_ext ! ! if test "$WXXML_PRESENCE" = "1"; then ! { echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6; } ! ! else ! { echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6; } ! ! fi ! ! ! CPPFLAGS="$SAVED_CPPFLAGS" ! CXXFLAGS="$SAVED_CXXFLAGS" ! CFLAGS="$SAVED_CFLAGS" ! LIBS="$SAVED_LIBS" ! ! ! if test "$WXXML_PRESENCE" = "1"; then ! # add xrc to the list of wx-config --libs ! WXLIB_NAMES="xml,$WXLIB_NAMES" ! else ! USE_WXBINDXML=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0" ! fi ! ! ! SAVED_CPPFLAGS="$CPPFLAGS" ! SAVED_CXXFLAGS="$CXXFLAGS" ! SAVED_CFLAGS="$CFLAGS" ! SAVED_LIBS="$LIBS" ! ! ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xrc` { echo "$as_me:$LINENO: checking if wxWidgets XRC bindings are available" >&5 *************** *** 6836,6857 **** ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! ! wx_temp="wx""_""$WX_PORT" ! ! if test "$WX_UNICODE" = "1"; then ! wx_temp="$wx_temp""u" ! fi ! if test "$WX_DEBUG" = "1"; then ! wx_temp="$wx_temp""d" ! fi ! ! wx_temp="$wx_temp""_""stc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! ! _WX_STC_LIBNAME=$wx_temp ! ! LIBS="$LIBS -l$_WX_STC_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets STC contrib is available" >&5 --- 6905,6911 ---- ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs stc` { echo "$as_me:$LINENO: checking if wxWidgets STC contrib is available" >&5 *************** *** 7144,7148 **** ! # recreate the wx-config --libs after determining what libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` --- 7198,7203 ---- ! # recreate the wx-config --libs after determining whacvs -z3 -d:ext:jr...@wx...:/cvsroot/wxlua diff wxLua ! t libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` |
|
From: John L. <jr...@us...> - 2008-01-11 17:22:42
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27705/wxLua/build/autoconf Modified Files: configure.ac Log Message: Use wx-config for the LIBS in the configure checks for adv,aui, etc so that we work with shared and static libraries. Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** configure.ac 10 Jan 2008 23:06:24 -0000 1.48 --- configure.ac 11 Jan 2008 17:22:37 -0000 1.49 *************** *** 173,177 **** ! WXLIB_NAMES="net,xml,core,base" WXLUA_LIBS="-llua5.1" --- 173,177 ---- ! WXLIB_NAMES="core,base" WXLUA_LIBS="-llua5.1" *************** *** 284,292 **** UTILS_SAVE_COREVAR() CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) ! LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" dnl check for this component presence --- 284,309 ---- UTILS_SAVE_COREVAR() + dnl add to the compilation & link flags the wxWidgets flags + dnl + dnl NOTE: this is very important since the test program + dnl we will compile needs to be linked against wx + dnl and the configure script will use these *FLAGS + dnl variables and it cannot be told to use other flags. + dnl + dnl NOTE2: we don't want to put into *FLAGS variables the + dnl WX_* variable values since the Makefile.in for + dnl a wxpresets-based application already merges + dnl the *FLAGS contents with WX_* vars + dnl + dnl NOTE3: the CXXFLAGS are merged with CPPFLAGS and + dnl thus we don't need to add the WX_CPPFLAGS to both + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! dnl before WX_LIBS we want the lib of Adv ! #WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) ! #LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs adv` dnl check for this component presence *************** *** 312,315 **** --- 329,337 ---- WX_CHECK_FOR_ADV if [[[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]]; then + + dnl # add to the library to link to the wxSTC lib *** Doesn't work for static builds + dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) + dnl WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" + # add adv to the list of wx-config --libs WXLIB_NAMES="adv,$WXLIB_NAMES" *************** *** 332,338 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! WX_LIKE_LIBNAME([_WX_AUI_LIBNAME], [wx], [aui]) ! LIBS="$LIBS -l$_WX_AUI_LIBNAME $WX_LIBS" dnl check for this component presence --- 354,358 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs aui` dnl check for this component presence *************** *** 378,384 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" dnl check for this component presence --- 398,402 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs gl` dnl check for this component presence *************** *** 424,430 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! WX_LIKE_LIBNAME([_WX_HTML_LIBNAME], [wx], [html]) ! LIBS="$LIBS -l$_WX_HTML_LIBNAME $WX_LIBS" dnl check for this component presence --- 442,446 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs html` dnl check for this component presence *************** *** 470,476 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! WX_LIKE_LIBNAME([_WX_MEDIA_LIBNAME], [wx], [media]) ! LIBS="$LIBS -l$_WX_MEDIA_LIBNAME $WX_LIBS" dnl check for this component presence --- 486,490 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs media` dnl check for this component presence *************** *** 516,522 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! WX_LIKE_LIBNAME([_WX_NET_LIBNAME], [wx], [net]) ! LIBS="$LIBS -l$_WX_NET_LIBNAME $WX_LIBS" dnl check for this component presence --- 530,534 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs net` dnl check for this component presence *************** *** 540,555 **** ]) ! dnl FIXME - no check for net since we can't use WX_LIKE_LIBNAME because it's libwx_baseud_net-2.8.so ! dnl WX_CHECK_FOR_NET ! dnl if test "$WXNET_PRESENCE" = "1"; then ! dnl # let's add Net binding library to the libraries to link ! dnl # so that if the user wants to use wxLua bindings to wxNet he ! dnl # won't have linking errors ! dnl WX_LIKE_LIBNAME([_WX_NET_LIBNAME], [wx], [net]) ! dnl WX_LIBS="-l$_WX_NET_LIBNAME $WX_LIBS" ! dnl else ! dnl USE_WXBINDNET=0 ! dnl CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0" ! dnl fi --- 552,563 ---- ]) ! WX_CHECK_FOR_NET ! if test "$WXNET_PRESENCE" = "1"; then ! # add net to the list of wx-config --libs ! WXLIB_NAMES="net,$WXLIB_NAMES" ! else ! USE_WXBINDNET=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0" ! fi *************** *** 566,572 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! WX_LIKE_LIBNAME([_WX_RICHTEXT_LIBNAME], [wx], [richtext]) ! LIBS="$LIBS -l$_WX_RICHTEXT_LIBNAME $WX_LIBS" dnl check for this component presence --- 574,578 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs richtext` dnl check for this component presence *************** *** 612,618 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! WX_LIKE_LIBNAME([_WX_XML_LIBNAME], [wx], [xml]) ! LIBS="$LIBS -l$_WX_XML_LIBNAME $WX_LIBS" dnl check for this component presence --- 618,622 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xml` dnl check for this component presence *************** *** 636,651 **** ]) ! dnl FIXME - no check for XML since we can't use WX_LIKE_LIBNAME because it's libwx_baseud_xml-2.8.so ! dnl WX_CHECK_FOR_XML ! dnl if test "$WXXML_PRESENCE" = "1"; then ! dnl # let's add XML binding library to the libraries to link ! dnl # so that if the user wants to use wxLua bindings to XML he ! dnl # won't have linking errors ! dnl WX_LIKE_LIBNAME([_WX_XML_LIBNAME], [wx], [xml]) ! dnl WX_LIBS="-l$_WX_XML_LIBNAME $WX_LIBS" ! dnl else ! dnl USE_WXBINDXML=0 ! dnl CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0" ! dnl fi --- 640,651 ---- ]) ! WX_CHECK_FOR_XML ! if test "$WXXML_PRESENCE" = "1"; then ! # add xrc to the list of wx-config --libs ! WXLIB_NAMES="xml,$WXLIB_NAMES" ! else ! USE_WXBINDXML=0 ! CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0" ! fi *************** *** 662,668 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! WX_LIKE_LIBNAME([_WX_XRC_LIBNAME], [wx], [xrc]) ! LIBS="$LIBS -l$_WX_XRC_LIBNAME $WX_LIBS" dnl check for this component presence --- 662,666 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs xrc` dnl check for this component presence *************** *** 706,729 **** UTILS_SAVE_COREVAR() - dnl add to the compilation & link flags the wxWidgets flags - dnl - dnl NOTE: this is very important since the test program - dnl we will compile needs to be linked against wx - dnl and the configure script will use these *FLAGS - dnl variables and it cannot be told to use other flags. - dnl - dnl NOTE2: we don't want to put into *FLAGS variables the - dnl WX_* variable values since the Makefile.in for - dnl a wxpresets-based application already merges - dnl the *FLAGS contents with WX_* vars - dnl - dnl NOTE3: the CXXFLAGS are merged with CPPFLAGS and - dnl thus we don't need to add the WX_CPPFLAGS to both CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! dnl before WX_LIBS we want the lib of STC ! WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! LIBS="$LIBS -l$_WX_STC_LIBNAME $WX_LIBS" dnl check for this component presence --- 704,710 ---- UTILS_SAVE_COREVAR() CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS=`$WX_CONFIG_NAME $WXCONFIG_FLAGS --libs stc` dnl check for this component presence *************** *** 754,760 **** if test $ac_cv_prog_stc_set = "1"; then - dnl # add to the library to link to the wxSTC lib - dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) - dnl WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" # add stc to the list of wx-config --libs WXLIB_NAMES="stc,$WXLIB_NAMES" --- 735,738 ---- *************** *** 841,845 **** dnl --------------------------------------------------------------------------- ! # recreate the wx-config --libs after determining what libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` --- 819,824 ---- dnl --------------------------------------------------------------------------- ! # recreate the wx-config --libs after determining whacvs -z3 -d:ext:jr...@wx...:/cvsroot/wxlua diff wxLua ! t libs we've found WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` |
|
From: John L. <jr...@us...> - 2008-01-11 06:56:10
|
Update of /cvsroot/wxlua/wxLua/build In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6057/wxLua/build Modified Files: Makefile_wx-config.in Log Message: Change the names of the libs created by the Makefiles using wx-config to match the names created by Bakefile w/ autoconf and its configure. Index: Makefile_wx-config.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile_wx-config.in 9 Jan 2008 05:47:26 -0000 1.4 --- Makefile_wx-config.in 11 Jan 2008 06:56:04 -0000 1.5 *************** *** 68,94 **** # The wxSTEditor library compiled from wxCode/components/wxstedit - WXSTEDIT_LIB = $(WXBASENAME)_stedit-$(WXRELEASE) WXSTEDIT_DIR = $(WXCODE)/components/wxstedit # ---------------------------------------------------------------------------- ! LUA_LIBS = $(WXLUA_DIR)/lib/liblua.a ! WXLUA_LIB = $(WXBASENAME)_wxlua-$(WXRELEASE) ! WXLUADEBUG_LIB = $(WXBASENAME)_wxluadebug-$(WXRELEASE) ! WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE) - WXLUABIND_LIB = $(WXBASENAME)_wxluabind-$(WXRELEASE) - WXLUABINDADV_LIB = $(WXBASENAME)_wxluaadv-$(WXRELEASE) - WXLUABINDAUI_LIB = $(WXBASENAME)_wxluaaui-$(WXRELEASE) - WXLUABINDBASE_LIB = $(WXBASENAME)_wxluabase-$(WXRELEASE) - WXLUABINDCORE_LIB = $(WXBASENAME)_wxluacore-$(WXRELEASE) - WXLUABINDGL_LIB = $(WXBASENAME)_wxluagl-$(WXRELEASE) - WXLUABINDHTML_LIB = $(WXBASENAME)_wxluahtml-$(WXRELEASE) - WXLUABINDMEDIA_LIB = $(WXBASENAME)_wxluamedia-$(WXRELEASE) - WXLUABINDNET_LIB = $(WXBASENAME)_wxluanet-$(WXRELEASE) - WXLUABINDRICHTEXT_LIB = $(WXBASENAME)_wxluarichtext-$(WXRELEASE) - WXLUABINDSTC_LIB = $(WXBASENAME)_wxluastc-$(WXRELEASE) - WXLUABINDXML_LIB = $(WXBASENAME)_wxluaxml-$(WXRELEASE) - WXLUABINDXRC_LIB = $(WXBASENAME)_wxluaxrc-$(WXRELEASE) WXLUABINDALL_LIBS = -l$(WXLUABINDXRC_LIB) -l$(WXLUABINDXML_LIB) -l$(WXLUABINDSTC_LIB) -l$(WXLUABINDRICHTEXT_LIB) -l$(WXLUABINDNET_LIB) -l$(WXLUABINDMEDIA_LIB) -l$(WXLUABINDHTML_LIB) -l$(WXLUABINDGL_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDAUI_LIB) -l$(WXLUABINDADV_LIB) --- 68,113 ---- # The wxSTEditor library compiled from wxCode/components/wxstedit WXSTEDIT_DIR = $(WXCODE)/components/wxstedit + WXSTEDIT_LIB = $(WXBASENAME)_stedit-$(WXRELEASE) + WXSTEDIT_LIB := $(patsubst wx_%,wxcode_%,$(WXSTEDIT_LIB)) # ---------------------------------------------------------------------------- ! LUA_LIBS = $(WXLUA_DIR)/lib/liblua.a ! WXLUA_LIB = $(WXBASENAME)_wxlua-$(WXRELEASE) ! WXLUADEBUG_LIB = $(WXBASENAME)_wxluadebug-$(WXRELEASE) ! WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE) ! ! WXLUABINDADV_LIB = $(WXBASENAME)_wxbindadv-$(WXRELEASE) ! WXLUABINDAUI_LIB = $(WXBASENAME)_wxbindaui-$(WXRELEASE) ! WXLUABINDBASE_LIB = $(WXBASENAME)_wxbindbase-$(WXRELEASE) ! WXLUABINDCORE_LIB = $(WXBASENAME)_wxbindcore-$(WXRELEASE) ! WXLUABINDGL_LIB = $(WXBASENAME)_wxbindgl-$(WXRELEASE) ! WXLUABINDHTML_LIB = $(WXBASENAME)_wxbindhtml-$(WXRELEASE) ! WXLUABINDMEDIA_LIB = $(WXBASENAME)_wxbindmedia-$(WXRELEASE) ! WXLUABINDNET_LIB = $(WXBASENAME)_wxbindnet-$(WXRELEASE) ! WXLUABINDRICHTEXT_LIB = $(WXBASENAME)_wxbindrichtext-$(WXRELEASE) ! WXLUABINDSTC_LIB = $(WXBASENAME)_wxbindstc-$(WXRELEASE) ! WXLUABINDXML_LIB = $(WXBASENAME)_wxbindxml-$(WXRELEASE) ! WXLUABINDXRC_LIB = $(WXBASENAME)_wxbindxrc-$(WXRELEASE) ! ! WXLUA_LIB := $(patsubst wx_%,wxlua_%,$(WXLUA_LIB)) ! WXLUADEBUG_LIB := $(patsubst wx_%,wxlua_%,$(WXLUADEBUG_LIB)) ! WXLUASOCKET_LIB := $(patsubst wx_%,wxlua_%,$(WXLUASOCKET_LIB)) ! ! WXLUABIND_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABIND_LIB)) ! WXLUABINDADV_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDADV_LIB)) ! WXLUABINDAUI_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDAUI_LIB)) ! WXLUABINDBASE_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDBASE_LIB)) ! WXLUABINDCORE_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDCORE_LIB)) ! WXLUABINDGL_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDGL_LIB)) ! WXLUABINDHTML_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDHTML_LIB)) ! WXLUABINDMEDIA_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDMEDIA_LIB)) ! WXLUABINDNET_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDNET_LIB)) ! WXLUABINDRICHTEXT_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDRICHTEXT_LIB)) ! WXLUABINDSTC_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDSTC_LIB)) ! WXLUABINDXML_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDXML_LIB)) ! WXLUABINDXRC_LIB := $(patsubst wx_%,wxlua_%,$(WXLUABINDXRC_LIB)) WXLUABINDALL_LIBS = -l$(WXLUABINDXRC_LIB) -l$(WXLUABINDXML_LIB) -l$(WXLUABINDSTC_LIB) -l$(WXLUABINDRICHTEXT_LIB) -l$(WXLUABINDNET_LIB) -l$(WXLUABINDMEDIA_LIB) -l$(WXLUABINDHTML_LIB) -l$(WXLUABINDGL_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDAUI_LIB) -l$(WXLUABINDADV_LIB) |
|
From: John L. <jr...@us...> - 2008-01-11 00:32:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21371/wxLua/modules/wxluadebug/src Modified Files: wxlstack.cpp Log Message: Force include of wxluasetup.h, temporarily, until a better way is found Index: wxlstack.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxlstack.cpp 20 Dec 2007 02:26:58 -0000 1.29 --- wxlstack.cpp 11 Jan 2008 00:32:36 -0000 1.30 *************** *** 87,97 **** { wxLuaStackListData* stkListData = (wxLuaStackListData*)m_stkDlg->m_listData[item]; ! wxCHECK_MSG(stkListData, NULL, wxT("Invalid wxLuaStackListData item")); wxLuaDebugItem* debugItem = stkListData->GetDebugItem(); ! wxCHECK_MSG(debugItem, NULL, wxT("Invalid wxLuaDebugItem item")); ! if (column == wxLuaStackDialog::LIST_COL_KEY) return m_stkDlg->GetItemImage(debugItem); ! else if (column == wxLuaStackDialog::LIST_COL_KEY_TYPE) { if (debugItem->GetFlagBit(WXLUA_DEBUGITEM_KEY_REF)) --- 87,97 ---- { wxLuaStackListData* stkListData = (wxLuaStackListData*)m_stkDlg->m_listData[item]; ! wxCHECK_MSG(stkListData, -1, wxT("Invalid wxLuaStackListData item")); wxLuaDebugItem* debugItem = stkListData->GetDebugItem(); ! wxCHECK_MSG(debugItem, -1, wxT("Invalid wxLuaDebugItem item")); ! if (column == wxLuaStackDialog::LIST_COL_KEY) return m_stkDlg->GetItemImage(debugItem); ! else if (column == wxLuaStackDialog::LIST_COL_KEY_TYPE) { if (debugItem->GetFlagBit(WXLUA_DEBUGITEM_KEY_REF)) *************** *** 103,107 **** } } ! else if (column == wxLuaStackDialog::LIST_COL_VALUE_TYPE) { if (debugItem->GetFlagBit(WXLUA_DEBUGITEM_VALUE_REF)) --- 103,107 ---- } } ! else if (column == wxLuaStackDialog::LIST_COL_VALUE_TYPE) { if (debugItem->GetFlagBit(WXLUA_DEBUGITEM_VALUE_REF)) *************** *** 404,408 **** dc.SelectObject(bmp); ! wxFont font(m_img_font_size, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); wxCoord w = 0, h = 0; --- 404,408 ---- dc.SelectObject(bmp); ! wxFont font(m_img_font_size, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); wxCoord w = 0, h = 0; |
|
From: John L. <jr...@us...> - 2008-01-11 00:32:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21371/wxLua/modules/wxbind/include Modified Files: wxbinddefs.h Log Message: Force include of wxluasetup.h, temporarily, until a better way is found Index: wxbinddefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxbinddefs.h 10 Jan 2008 23:06:26 -0000 1.9 --- wxbinddefs.h 11 Jan 2008 00:32:36 -0000 1.10 *************** *** 13,16 **** --- 13,17 ---- #include "wx/defs.h" #include "wxlua/include/wxlstate.h" + #include "../setup/wxluasetup.h" // ---------------------------------------------------------------------------- |
