[Wxlua-commit] wxLua/build/autoconf aclocal.m4, 1.56, 1.57 autoconf_inc.m4, 1.28, 1.29 configure.ac, 1.65, 1.66 utils.m4, 1.2, 1.3

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

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

Modified Files:
	aclocal.m4 autoconf_inc.m4 configure.ac utils.m4 
Log Message:
don't build lua interpreter and lua compiler if using system lua

Index: utils.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/utils.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utils.m4	14 Jan 2008 12:11:32 -0000	1.2
--- utils.m4	15 Jan 2008 20:19:56 -0000	1.3
***************
*** 109,112 ****
--- 109,135 ----
      ])
  
+ AC_DEFUN([UTILS_BOOLOPT_INV_SUMMARY],
+         [
+         if [[ "x$$1" = "x0" ]]; then
+             echo $2
+         elif [[ "x$$1" = "x1" ]]; then
+             echo $3
+         else
+             echo "$1 is $$1"
+         fi
+     ])
+ 
+ # same as UTILS_BOOLOPT_SUMMARY but takes 2 bool options
+ AC_DEFUN([UTILS_2BOOLOPT_INV_SUMMARY],
+         [
+         if [[ "x$$1" = "x0" -a "x$$2" = "x0" ]]; then
+             echo $3
+         elif [[ "x$$1" = "x1" -o "x$$2" = "x1" ]]; then
+             echo $4
+         else
+             echo "$1 is $$1; $2 is $$2"
+         fi
+     ])
+ 
  
  dnl ---------------------------------------------------------------------------

Index: autoconf_inc.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** autoconf_inc.m4	15 Jan 2008 00:04:58 -0000	1.28
--- autoconf_inc.m4	15 Jan 2008 20:19:55 -0000	1.29
***************
*** 117,121 ****
      fi
      AC_SUBST(COND_PLATFORM_WIN32_1)
! dnl ### begin block 20_COND_SHARED_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ###
      COND_SHARED_0="#"
      if test "x$SHARED" = "x0" ; then
--- 117,121 ----
      fi
      AC_SUBST(COND_PLATFORM_WIN32_1)
! dnl ### begin block 20_COND_SHARED_0[../../modules/build/bakefiles/modules.bkl] ###
      COND_SHARED_0="#"
      if test "x$SHARED" = "x0" ; then
***************
*** 123,127 ****
      fi
      AC_SUBST(COND_SHARED_0)
! dnl ### begin block 20_COND_SHARED_0_USE_SYSTEM_LUA_0[../../modules/build/bakefiles/modules.bkl] ###
      COND_SHARED_0_USE_SYSTEM_LUA_0="#"
      if test "x$SHARED" = "x0" -a "x$USE_SYSTEM_LUA" = "x0" ; then
--- 123,127 ----
      fi
      AC_SUBST(COND_SHARED_0)
! dnl ### begin block 20_COND_SHARED_0_USE_SYSTEM_LUA_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ###
      COND_SHARED_0_USE_SYSTEM_LUA_0="#"
      if test "x$SHARED" = "x0" -a "x$USE_SYSTEM_LUA" = "x0" ; then
***************
*** 345,348 ****
--- 345,354 ----
      fi
      AC_SUBST(COND_USE_SOVERSOLARIS_1)
+ dnl ### begin block 20_COND_USE_SYSTEM_LUA_0[../../apps/build/bakefiles/apps.bkl] ###
+     COND_USE_SYSTEM_LUA_0="#"
+     if test "x$USE_SYSTEM_LUA" = "x0" ; then
+         COND_USE_SYSTEM_LUA_0=""
+     fi
+     AC_SUBST(COND_USE_SYSTEM_LUA_0)
  dnl ### begin block 20_COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1[../../apps/build/bakefiles/apps.bkl] ###
      COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1="#"

Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** configure.ac	15 Jan 2008 19:45:27 -0000	1.65
--- configure.ac	15 Jan 2008 20:19:55 -0000	1.66
***************
*** 743,746 ****
--- 743,758 ----
  # applications
  echo
+ 
+ # note that these use the _INV_ version of the macros since in the bakefiles
+ # the associated "cond" property are respectively USE_SYSTEM_LUA=='0' and
+ # SHARED=='0' and USE_SYSTEM_LUA=='1'
+ UTILS_BOOLOPT_INV_SUMMARY([USE_SYSTEM_LUA],
+         ["  - Lua interpreter:                yes"],
+         ["  - Lua interpreter:                no"])
+ UTILS_2BOOLOPT_INV_SUMMARY([SHARED], [USE_SYSTEM_LUA],
+         ["  - Lua compiler:                   yes"],
+         ["  - Lua compiler:                   no"])
+ 
+ # these use "normal" versions of the macros
  UTILS_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG],
          ["  - wxLua application:              yes"],

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** aclocal.m4	15 Jan 2008 18:37:27 -0000	1.56
--- aclocal.m4	15 Jan 2008 20:19:55 -0000	1.57
***************
*** 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,