[Wxlua-commit] wxLua/build/autoconf aclocal.m4,1.26,1.27 autoconf_inc.m4,1.16,1.17 configure.ac,1.27,1.28

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

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

Modified Files:
	aclocal.m4 autoconf_inc.m4 configure.ac 
Log Message:
added luamodule

Index: autoconf_inc.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** autoconf_inc.m4	8 May 2006 15:50:48 -0000	1.16
--- autoconf_inc.m4	20 May 2006 12:16:53 -0000	1.17
***************
*** 169,172 ****
--- 169,178 ----
      fi
      AC_SUBST(COND_USE_BIN2C_1)
+ dnl ### begin block 20_COND_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ###
+     COND_USE_LUAMODULE_1="#"
+     if test "x$USE_LUAMODULE" = "x1" ; then
+         COND_USE_LUAMODULE_1=""
+     fi
+     AC_SUBST(COND_USE_LUAMODULE_1)
  dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../modules/build/bakefiles/modules.bkl] ###
      COND_USE_SOSYMLINKS_1="#"


Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** configure.ac	14 May 2006 12:55:56 -0000	1.27
--- configure.ac	20 May 2006 12:16:53 -0000	1.28
***************
*** 41,44 ****
--- 41,47 ----
                  [AC_HELP_STRING([--enable-wxluafreeze-app], [Compiles the wxLuaFreeze app (default is yes)])],
                  [], [enable_wxluafreeze_app=yes])
+ AC_ARG_ENABLE([luamodule],
+                 [AC_HELP_STRING([--enable-luamodule], [Compiles the lua module (default is yes)])],
+                 [], [enable_luamodule_app=yes])
  
  
***************
*** 65,68 ****
--- 68,72 ----
  AM_YESNO_OPTCHECK([USE_WXLUAEDITAPP], [enable_wxluaedit_app], [--enable-wxluaedit-app])
  AM_YESNO_OPTCHECK([USE_WXLUAFREEZEAPP], [enable_wxluafreeze_app], [--enable-wxluafreeze-app])
+ AM_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule_app], [--enable-luamodule])
  
  AM_YESNO_OPTCHECK([USE_WXBINDSTC], [enable_wxbindstc], [--enable-wxbindstc])
***************
*** 282,288 ****
--- 286,308 ----
  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
+ # the wx.so library in ../lib; thus we need to copy the sample(s) to the
+ # build directory to preserve the relative path correctness
+ if [[ ! -z "$srcdir" ]]; then
+ 
+     AC_MSG_NOTICE([configure: copying $srcdir/samples to ./samples])
+     cp -r "$srcdir/samples" samples
+ 
+     # NB: we don't use AC_CONFIG_LINKS([samples:samples], [cp]) because making
+     #     a symbolic link from $srcdir/samples to samples would not work for
+     #     luamodule.wx.lua (because require("wx") uses the effective path).
+ fi
+ 
  AC_OUTPUT
  
  
+ 
+ 
  # output a nice summary of detected options
  # NOTE: keep build conditions in synch with bakefiles; e.g. app_wxlua is
***************
*** 294,297 ****
--- 314,318 ----
  
  # applications
+ echo
  AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG],
          ["  - wxLua application:        yes"],
***************
*** 308,311 ****
--- 329,333 ----
  
  # modules
+ echo
  AM_BOOLOPT_SUMMARY([USE_WXBINDSTC],
          ["  - wxBindSTC module:         yes"],
***************
*** 317,321 ****
--- 339,348 ----
          ["  - wxLuaSocket module:       yes"],
          ["  - wxLuaSocket module:       no"])
+ AM_BOOLOPT_SUMMARY([USE_LUAMODULE],
+         ["  - Lua module:               yes"],
+         ["  - Lua module:               no"])
  
+ # miscellaneous
+ echo
  AM_BOOLOPT_SUMMARY([INSTALL_CUSTOM_WXBIND],
          ["  - custom wxBind install:    yes"],