Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename WX_VERSION_FULL back to WX_VERSION

Browse Source 
WX_VERSION was renamed to WX_VERSION_FULL for some reason in rev 44731 but
this was a backwards incompatible change as the existing configure scripts
could (and did) use WX_VERSION, so undo this change, at least until someone
finds a worthy reason for it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-08-14 22:28:44 +00:00
parent f2b1c98a00
commit 731eee9af2
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wxwin.m4
View File

@@ -122,7 +122,7 @@ dnl wx_ver_ok=yes if it is:
AC_DEFUN([_WX_PRIVATE_CHECK_VERSION], AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
[ [
wx_ver_ok="" wx_ver_ok=""
if test "x$WX_VERSION_FULL" != x ; then if test "x$WX_VERSION" != x ; then
if test $wx_config_major_version -gt $1; then if test $wx_config_major_version -gt $1; then
wx_ver_ok=yes wx_ver_ok=yes
else else
@@ -202,7 +202,7 @@ AC_DEFUN([WX_CONFIG_CHECK],
fi fi
if test "$WX_CONFIG_PATH" != "no" ; then if test "$WX_CONFIG_PATH" != "no" ; then
WX_VERSION_FULL="" WX_VERSION=""
min_wx_version=ifelse([$1], ,2.2.1,$1) min_wx_version=ifelse([$1], ,2.2.1,$1)
if test -z "$5" ; then if test -z "$5" ; then
@@ -215,12 +215,12 @@ AC_DEFUN([WX_CONFIG_CHECK],
dnl an error when it's used with --version below dnl an error when it's used with --version below
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5" WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"
WX_VERSION_FULL=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
wx_config_major_version=`echo $WX_VERSION_FULL | \ wx_config_major_version=`echo $WX_VERSION | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
wx_config_minor_version=`echo $WX_VERSION_FULL | \ wx_config_minor_version=`echo $WX_VERSION | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
wx_config_micro_version=`echo $WX_VERSION_FULL | \ wx_config_micro_version=`echo $WX_VERSION | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
wx_requested_major_version=`echo $min_wx_version | \ wx_requested_major_version=`echo $min_wx_version | \
@@ -235,7 +235,7 @@ AC_DEFUN([WX_CONFIG_CHECK],
[$wx_requested_micro_version]) [$wx_requested_micro_version])
if test -n "$wx_ver_ok"; then if test -n "$wx_ver_ok"; then
AC_MSG_RESULT(yes (version $WX_VERSION_FULL)) AC_MSG_RESULT(yes (version $WX_VERSION))
WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4` WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`
dnl is this even still appropriate? --static is a real option now dnl is this even still appropriate? --static is a real option now
@@ -308,11 +308,11 @@ AC_DEFUN([WX_CONFIG_CHECK],
else else
if test "x$WX_VERSION_FULL" = x; then if test "x$WX_VERSION" = x; then
dnl no wx-config at all dnl no wx-config at all
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
else else
AC_MSG_RESULT(no (version $WX_VERSION_FULL is not new enough)) AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
fi fi
WX_CFLAGS="" WX_CFLAGS=""
@@ -369,7 +369,7 @@ AC_DEFUN([WX_CONFIG_CHECK],
AC_SUBST(WX_CXXFLAGS_ONLY) AC_SUBST(WX_CXXFLAGS_ONLY)
AC_SUBST(WX_LIBS) AC_SUBST(WX_LIBS)
AC_SUBST(WX_LIBS_STATIC) AC_SUBST(WX_LIBS_STATIC)
AC_SUBST(WX_VERSION_FULL) AC_SUBST(WX_VERSION)
AC_SUBST(WX_RESCOMP) AC_SUBST(WX_RESCOMP)
dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols
@@ -804,7 +804,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
AC_MSG_ERROR([ AC_MSG_ERROR([
Cannot detect the wxWidgets configuration for the selected wxWidgets build Cannot detect the wxWidgets configuration for the selected wxWidgets build
since its version is $WX_VERSION_FULL < 2.6.0; please install a newer since its version is $WX_VERSION < 2.6.0; please install a newer
version of wxWidgets. version of wxWidgets.
]) ])
fi fi
@@ -998,7 +998,7 @@ AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG],
WX_BOOLOPT_SUMMARY([WX_DEBUG], [" - DEBUG build"], [" - RELEASE build"]) WX_BOOLOPT_SUMMARY([WX_DEBUG], [" - DEBUG build"], [" - RELEASE build"])
WX_BOOLOPT_SUMMARY([WX_UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) WX_BOOLOPT_SUMMARY([WX_UNICODE], [" - UNICODE mode"], [" - ANSI mode"])
WX_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"]) WX_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"])
echo " - VERSION: $WX_VERSION_FULL" echo " - VERSION: $WX_VERSION"
echo " - PORT: $WX_PORT" echo " - PORT: $WX_PORT"
]) ])