[Wxlua-commit] wxLua/build/autoconf wxwin.m4,1.2,1.3

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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