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 ---- |