[Wxlua-commit] wxLua/build/autoconf aclocal.m4, 1.37, 1.38 configure.ac, 1.37, 1.38

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25620/build/autoconf

Modified Files:
	aclocal.m4 configure.ac 
Log Message:
small AP fixes

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** aclocal.m4	22 Dec 2006 20:45:06 -0000	1.37
--- aclocal.m4	24 Dec 2006 13:30:56 -0000	1.38
***************
*** 1723,3036 ****
          ])
  
! dnl ---------------------------------------------------------------------------
! dnl Author:          wxWidgets development team,
! dnl                  Francesco Montorsi,
! dnl                  Bob McCown (Mac-testing)
! dnl Creation date:
! dnl RCS-ID:          $Id$
! dnl ---------------------------------------------------------------------------
! 
[...1288 lines suppressed...]
!     ])
! 
! AC_DEFUN([AM_WXPRESETS_SUMMARY_MSG_END],
!     [
!         echo
!         echo "  The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION"
!         echo "  has the following settings:"
!         AM_WXPRESETS_SUMMARY_MSG
!         echo
!         echo "  Now, just run make."
!         echo " ----------------------------------------------------------------"
!         echo
!     ])
! 
! 
! 
--- 1723,1725 ----
          ])
  
! m4_include([../../wxwin.m4])

Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** configure.ac	23 Dec 2006 11:10:52 -0000	1.37
--- configure.ac	24 Dec 2006 13:30:56 -0000	1.38
***************
*** 315,321 ****
  
  # check for the wxStEdit component...
! if [[ "$USE_WXLUAEDITAPP" = "1" ]]; then
  
!     minversion="1.2.0"
  
      AM_SET_WXLIKE_LIBNAME([wx], [stedit])
--- 315,323 ----
  
  # check for the wxStEdit component...
! # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol
! #       to get rid of this check which fails for some reason when building the AP
! if [[ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]]; then
  
!     minversion="1.2.4"
  
      AM_SET_WXLIKE_LIBNAME([wx], [stedit])
***************
*** 326,333 ****
                        [ac_cv_prog_stedit_set=0])
  
!     if test $ac_cv_prog_stedit_set = "1"; then
!         # add to the library to link to the wxStEdit lib
!         WX_LIBS="$wxstedit_lib $WX_LIBS"
!     else
          AM_SET_WXBUILD_STR
          AC_MSG_NOTICE([
--- 328,332 ----
                        [ac_cv_prog_stedit_set=0])
  
!     if test $ac_cv_prog_stedit_set = "0"; then
          AM_SET_WXBUILD_STR
          AC_MSG_NOTICE([
***************
*** 387,391 ****
  
  AC_BAKEFILE([m4_include(autoconf_inc.m4)])
! AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile build/autoconf/wxlua.pc])
  
  # since at least the "luamodule.wx.lua" sample require to be able to find
--- 386,390 ----
  
  AC_BAKEFILE([m4_include(autoconf_inc.m4)])
! AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile build/autoconf/wxlua.pc distrib/autopackage/default.apspec])
  
  # since at least the "luamodule.wx.lua" sample require to be able to find