Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22600/build/autoconf
Modified Files:
aclocal.m4 configure.ac
Log Message:
added final newlines to *defs.h; added WXMAKINGDLL_LUAMODULE; fixed configure script message
Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** configure.ac 20 May 2006 12:16:53 -0000 1.28
--- configure.ac 21 May 2006 19:16:59 -0000 1.29
***************
*** 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])
--- 41,44 ----
***************
*** 56,62 ****
[AC_HELP_STRING([--enable-wxluasocket], [Compiles the wxLua socket support (default is yes)])],
[], [enable_wxluasocket=yes])
! AC_ARG_ENABLE([wxluasocket],
! [AC_HELP_STRING([--enable-wxluasocket], [Compiles the wxLua socket support (default is yes)])],
! [], [enable_wxluasocket=yes])
AC_ARG_ENABLE([customwxbind-install],
[AC_HELP_STRING([--enable-customwxbind-install], [Installs wxBind sources for custom builds (default is yes)])],
--- 53,59 ----
[AC_HELP_STRING([--enable-wxluasocket], [Compiles the wxLua socket support (default is yes)])],
[], [enable_wxluasocket=yes])
! AC_ARG_ENABLE([luamodule],
! [AC_HELP_STRING([--enable-luamodule], [Compiles the lua module (default is yes)])],
! [], [enable_luamodule=yes])
AC_ARG_ENABLE([customwxbind-install],
[AC_HELP_STRING([--enable-customwxbind-install], [Installs wxBind sources for custom builds (default is yes)])],
***************
*** 68,76 ****
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])
AM_YESNO_OPTCHECK([USE_WXLUADEBUG], [enable_wxluadebug], [--enable-wxluadebug])
AM_YESNO_OPTCHECK([USE_WXLUASOCKET], [enable_wxluasocket], [--enable-wxluasocket])
AM_YESNO_OPTCHECK([INSTALL_CUSTOM_WXBIND], [enable_customwxbind_install], [--enable-customwxbind-install])
--- 65,74 ----
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_WXBINDSTC], [enable_wxbindstc], [--enable-wxbindstc])
AM_YESNO_OPTCHECK([USE_WXLUADEBUG], [enable_wxluadebug], [--enable-wxluadebug])
AM_YESNO_OPTCHECK([USE_WXLUASOCKET], [enable_wxluasocket], [--enable-wxluasocket])
+ AM_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule], [--enable-luamodule])
+
AM_YESNO_OPTCHECK([INSTALL_CUSTOM_WXBIND], [enable_customwxbind_install], [--enable-customwxbind-install])
***************
*** 93,96 ****
--- 91,106 ----
#####################################################################
+
+ # check for wxWidgets
+ #
+ # NB: to avoid getting "-g -02" repeated twice in CPPFLAGS, we need
+ # wxWidgets checks BEFORE lua checks (that's a long story - trust me)
+
+ WXLIBS_REQUIRED="xrc,html,adv,net,xml"
+ AM_WXPRESETS_FULL([2.4.0], [$WXLIBS_REQUIRED])
+ AC_SUBST(WXLIBS_REQUIRED)
+
+
+
# Checks used to determine right LUA flags (see modules/lua/src/Makefile)
luadefs=
***************
*** 122,130 ****
- # check for wxWidgets
- WXLIBS_REQUIRED="xrc,html,adv,net,xml"
- AM_WXPRESETS_FULL([2.4.0], [$WXLIBS_REQUIRED])
- AC_SUBST(WXLIBS_REQUIRED)
-
--- 132,135 ----
***************
*** 316,351 ****
echo
AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG],
! [" - wxLua application: yes"],
! [" - wxLua application: no"])
! AM_2BOOLOPT_SUMMARY([USE_WXLUACANAPP], [USE_WXBINDSTC],
! [" - wxLuaCan application: yes"],
! [" - wxLuaCan application: no"])
! AM_BOOLOPT_SUMMARY([USE_WXLUAEDITAPP],
! [" - wxLuaEdit application: yes"],
! [" - wxLuaEdit application: no"])
AM_BOOLOPT_SUMMARY([USE_WXLUAFREEZEAPP],
! [" - wxLuaFreeze application: yes"],
! [" - wxLuaFreeze application: no"])
# modules
echo
AM_BOOLOPT_SUMMARY([USE_WXBINDSTC],
! [" - wxBindSTC module: yes"],
! [" - wxBindSTC module: no"])
AM_BOOLOPT_SUMMARY([USE_WXLUADEBUG],
! [" - wxLuaDebug module: yes"],
! [" - wxLuaDebug module: no"])
AM_BOOLOPT_SUMMARY([USE_WXLUASOCKET],
! [" - 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"],
! [" - custom wxBind install: no"])
AM_WXPRESETS_MSG_END
--- 321,357 ----
echo
AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG],
! [" - wxLua application: yes"],
! [" - wxLua application: no"])
! AM_BOOLOPT_SUMMARY([USE_WXLUACANAPP],
! [" - wxLuaCan application: yes"],
! [" - wxLuaCan application: no"])
! AM_2BOOLOPT_SUMMARY([USE_WXLUAEDITAPP], [USE_WXBINDSTC],
! [" - wxLuaEdit application: yes"],
! [" - wxLuaEdit application: no"])
AM_BOOLOPT_SUMMARY([USE_WXLUAFREEZEAPP],
! [" - wxLuaFreeze application: yes"],
! [" - wxLuaFreeze application: no"])
# modules
echo
AM_BOOLOPT_SUMMARY([USE_WXBINDSTC],
! [" - wxBindSTC module: yes"],
! [" - wxBindSTC module: no"])
AM_BOOLOPT_SUMMARY([USE_WXLUADEBUG],
! [" - wxLuaDebug module: yes"],
! [" - wxLuaDebug module: no"])
AM_BOOLOPT_SUMMARY([USE_WXLUASOCKET],
! [" - 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],
! [" - install custom wxBind stuff: yes"],
! [" - install custom wxBind stuff: no"])
!
AM_WXPRESETS_MSG_END
|
