Thread: [Wxlua-commit] wxLua/build/autoconf aclocal.m4, 1.50, 1.51 configure.ac, 1.51, 1.52 wxwin.m4, 1.1,

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-serv24693/build/autoconf

Modified Files:
	aclocal.m4 configure.ac wxwin.m4 
Log Message:
updated the wxwin.m4 from wxTRUNK, so that it works also with newer (2.9) wx-config scripts

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** aclocal.m4	10 Jan 2008 00:25:16 -0000	1.50
--- aclocal.m4	12 Jan 2008 09:58:46 -0000	1.51
***************
*** 1,6 ****
! # generated automatically by aclocal 1.10 -*- Autoconf -*-

  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
! # 2005, 2006  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! # generated automatically by aclocal 1.9.6 -*- Autoconf -*-

  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
! # 2005  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,

Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** configure.ac	11 Jan 2008 23:39:05 -0000	1.51
--- configure.ac	12 Jan 2008 09:58:46 -0000	1.52
***************
*** 897,901 ****

  # now that we know the wxWidgets' version, we can update the PACKAGE_VERSION var
! PACKAGE_VERSION="$WX_VERSION_FULL.$PACKAGE_VERSION"

--- 897,901 ----

  # now that we know the wxWidgets' version, we can update the PACKAGE_VERSION var
! PACKAGE_VERSION="$WX_VERSION.$PACKAGE_VERSION"

Index: wxwin.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxwin.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxwin.m4	27 Jul 2007 13:33:41 -0000	1.1
--- wxwin.m4	12 Jan 2008 09:58:46 -0000	1.2
***************
*** 8,12 ****

  dnl ===========================================================================
! dnl Table of Contents of this macro 
  dnl -------------------------------------
  dnl
--- 8,12 ----

  dnl ===========================================================================
! dnl Table of Contents of this macro file:
  dnl -------------------------------------
  dnl
***************
*** 123,127 ****
  [
      wx_ver_ok=""
!     if test "x$WX_VERSION_FULL" != x ; then
        if test $wx_config_major_version -gt $1; then
          wx_ver_ok=yes
--- 123,127 ----
  [
      wx_ver_ok=""
!     if test "x$WX_VERSION" != x ; then
        if test $wx_config_major_version -gt $1; then
          wx_ver_ok=yes
***************
*** 203,207 ****

    if test "$WX_CONFIG_PATH" != "no" ; then
!     WX_VERSION_FULL=""

      min_wx_version=ifelse([$1], ,2.2.1,$1)
--- 203,207 ----

    if test "$WX_CONFIG_PATH" != "no" ; then
!     WX_VERSION=""

      min_wx_version=ifelse([$1], ,2.2.1,$1)
***************
*** 212,223 ****
      fi

!     WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"

!     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/'`

--- 212,225 ----
      fi

!     dnl don't add the libraries ($4) to this variable as this would result in
!     dnl an error when it's used with --version below
!     WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"

!     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/'`

***************
*** 234,240 ****

      if test -n "$wx_ver_ok"; then
! 
!       AC_MSG_RESULT(yes (version $WX_VERSION_FULL))
!       WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`

        dnl is this even still appropriate?  --static is a real option now
--- 236,241 ----

      if test -n "$wx_ver_ok"; then
!       AC_MSG_RESULT(yes (version $WX_VERSION))
!       WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`

        dnl is this even still appropriate?  --static is a real option now
***************
*** 243,247 ****
        dnl For now keep it in case anyone actually used it in the past.
        AC_MSG_CHECKING([for wxWidgets static library])
!       WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
        if test "x$WX_LIBS_STATIC" = "x"; then
          AC_MSG_RESULT(no)
--- 244,248 ----
        dnl For now keep it in case anyone actually used it in the past.
        AC_MSG_CHECKING([for wxWidgets static library])
!       WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null`
        if test "x$WX_LIBS_STATIC" = "x"; then
          AC_MSG_RESULT(no)
***************
*** 288,292 ****
        if test "x$wx_has_cppflags" = x ; then
           dnl no choice but to define all flags like CFLAGS
!          WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
           WX_CPPFLAGS=$WX_CFLAGS
           WX_CXXFLAGS=$WX_CFLAGS
--- 289,293 ----
        if test "x$wx_has_cppflags" = x ; then
           dnl no choice but to define all flags like CFLAGS
!          WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
           WX_CPPFLAGS=$WX_CFLAGS
           WX_CXXFLAGS=$WX_CFLAGS
***************
*** 296,302 ****
        else
           dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
!          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 *@@"`
--- 297,303 ----
        else
           dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
!          WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
!          WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
!          WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`

           WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
***************
*** 308,316 ****
      else

!        if test "x$WX_VERSION_FULL" = x; then
            dnl no wx-config at all
            AC_MSG_RESULT(no)
         else
!           AC_MSG_RESULT(no (version $WX_VERSION_FULL is not new enough))
         fi

--- 309,317 ----
      else

!        if test "x$WX_VERSION" = x; then
            dnl no wx-config at all
            AC_MSG_RESULT(no)
         else
!           AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
         fi

***************
*** 369,373 ****
    AC_SUBST(WX_LIBS)
    AC_SUBST(WX_LIBS_STATIC)
!   AC_SUBST(WX_VERSION_FULL)
    AC_SUBST(WX_RESCOMP)

--- 370,374 ----
    AC_SUBST(WX_LIBS)
    AC_SUBST(WX_LIBS_STATIC)
!   AC_SUBST(WX_VERSION)
    AC_SUBST(WX_RESCOMP)

***************
*** 572,576 ****
          dnl the $1 argument contains respectively the debug,unicode or shared options.

!         ifelse(index([$1], [debug]), [-1],,
                 [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])])

--- 573,578 ----
          dnl the $1 argument contains respectively the debug,unicode or shared options.

!         dnl be careful here not to set debug flag if only "wxdebug" was specified
!         ifelse(regexp([$1], [\bdebug]), [-1],,
                 [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])])

***************
*** 578,582 ****
                 [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])])

!         ifelse(index([$1], [shared]), [-1],,
                 [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])

--- 580,584 ----
                 [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])])

!         ifelse(regexp([$1], [\bshared]), [-1],,
                 [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])

***************
*** 804,808 ****
              AC_MSG_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.
                           ])
--- 806,810 ----
              AC_MSG_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.
                           ])
***************
*** 998,1002 ****
          WX_BOOLOPT_SUMMARY([WX_UNICODE], ["  - UNICODE mode"], ["  - ANSI mode"])
          WX_BOOLOPT_SUMMARY([WX_SHARED],  ["  - SHARED mode"],  ["  - STATIC mode"])
!         echo "  - VERSION: $WX_VERSION_FULL"
          echo "  - PORT: $WX_PORT"
      ])
--- 1000,1004 ----
          WX_BOOLOPT_SUMMARY([WX_UNICODE], ["  - UNICODE mode"], ["  - ANSI mode"])
          WX_BOOLOPT_SUMMARY([WX_SHARED],  ["  - SHARED mode"],  ["  - STATIC mode"])
!         echo "  - VERSION: $WX_VERSION"
          echo "  - PORT: $WX_PORT"
      ])
***************
*** 1048,1050 ****

- 
--- 1050,1051 ----

Thread: [Wxlua-commit] wxLua/build/autoconf aclocal.m4, 1.50, 1.51 configure.ac, 1.51, 1.52 wxwin.m4, 1.1,

wxlua-commit