From: Francesco M. <fr...@us...> - 2007-02-27 19:52:02
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17056 Modified Files: configure Log Message: fixed the problem as reported by Anders about stc/gl additional lib problem Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** configure 27 Feb 2007 19:05:02 -0000 1.49 --- configure 27 Feb 2007 19:51:58 -0000 1.50 *************** *** 6988,6992 **** OLD_WXLIBS=$WX_LIBS ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" LIBS="$LIBS $WX_LIBS" --- 6988,6998 ---- OLD_WXLIBS=$WX_LIBS ! if test -z "$WX_ADDITIONAL_LIBS"; then ! WX_ADDITIONAL_LIBS="stc" ! else ! WX_ADDITIONAL_LIBS="stc,$WX_ADDITIONAL_LIBS" ! fi ! ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS $WX_ADDITIONAL_LIBS --libs)" LIBS="$LIBS $WX_LIBS" *************** *** 7080,7084 **** # add to the library to link to the wxSTC lib ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" else --- 7086,7096 ---- # add to the library to link to the wxSTC lib ! if test -z "$WX_ADDITIONAL_LIBS"; then ! WX_ADDITIONAL_LIBS="stc" ! else ! WX_ADDITIONAL_LIBS="stc,$WX_ADDITIONAL_LIBS" ! fi ! ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS $WX_ADDITIONAL_LIBS --libs)" else *************** *** 7364,7368 **** OLD_WXLIBS=$WX_LIBS ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS gl,$WX_ADDITIONAL_LIBS --libs)" LIBS="$LIBS $WX_LIBS" --- 7376,7386 ---- OLD_WXLIBS=$WX_LIBS ! if test -z "$WX_ADDITIONAL_LIBS"; then ! WX_ADDITIONAL_LIBS="gl" ! else ! WX_ADDITIONAL_LIBS="gl,$WX_ADDITIONAL_LIBS" ! fi ! ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS $WX_ADDITIONAL_LIBS --libs)" LIBS="$LIBS $WX_LIBS" *************** *** 7455,7459 **** # won't have linking errors ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS gl,$WX_ADDITIONAL_LIBS --libs)" fi --- 7473,7483 ---- # won't have linking errors ! if test -z "$WX_ADDITIONAL_LIBS"; then ! WX_ADDITIONAL_LIBS="gl" ! else ! WX_ADDITIONAL_LIBS="gl,$WX_ADDITIONAL_LIBS" ! fi ! ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS $WX_ADDITIONAL_LIBS --libs)" fi |