Menu
▾
▴
[Wxlua-commit] wxLua configure,1.63,1.64
|
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" |
