[Wxlua-commit] wxLua configure,1.77,1.78

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	configure 
Log Message:
Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything.
configure has been updated to add the option --enable-monolithic-luamodule

Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl


Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** configure	15 Jan 2008 20:19:55 -0000	1.77
--- configure	19 Jan 2008 21:37:07 -0000	1.78
***************
*** 765,768 ****
--- 765,770 ----
  COND_ICC_PCH_1
  COND_INSTALL_CUSTOM_WXBIND_1
+ COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1
+ COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1
  COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
  COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
***************
*** 788,792 ****
  COND_SHARED_0_USE_WXLUASOCKET_1
  COND_SHARED_1
- COND_SHARED_1_USE_LUAMODULE_1
  COND_SHARED_1_USE_SYSTEM_LUA_0
  COND_SHARED_1_USE_WXBINDADV_1
--- 790,793 ----
***************
*** 1442,1445 ****
--- 1443,1448 ----
    --enable-wxluasocket    Compiles the wxLua socket support (default is yes)
    --enable-luamodule      Compiles the lua module (default is yes)
+   --enable-monolithic-luamodule
+                           Compile a monolithic lua module (default is no)
    --enable-customwxbind-install
                            Installs wxBind sources for custom builds (default
***************
*** 2440,2443 ****
--- 2443,2453 ----
  fi
  
+ # Check whether --enable-monolithic_luamodule was given.
+ if test "${enable_monolithic_luamodule+set}" = set; then
+   enableval=$enable_monolithic_luamodule;
+ else
+   enable_monolithic_luamodule=no
+ fi
+ 
  # Check whether --enable-customwxbind-install was given.
  if test "${enable_customwxbind_install+set}" = set; then
***************
*** 2783,2786 ****
--- 2793,2809 ----
  
  
+         { echo "$as_me:$LINENO: checking for the --enable-monolithic-luamodule option" >&5
+ echo $ECHO_N "checking for the --enable-monolithic-luamodule option... $ECHO_C" >&6; }
+         if [ "x$enable_monolithic_luamodule" = "xyes" ]; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             MONOLITHIC_LUAMODULE=1
+         else
+             { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+             MONOLITHIC_LUAMODULE=0
+         fi
+ 
+ 
  
          { echo "$as_me:$LINENO: checking for the --enable-customwxbind-install option" >&5
***************
*** 13182,13185 ****
--- 13205,13218 ----
      fi
  
+     COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1="#"
+     if test "x$MONOLITHIC_LUAMODULE" = "x0" -a "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then
+         COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1=""
+     fi
+ 
+     COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1="#"
+     if test "x$MONOLITHIC_LUAMODULE" = "x1" -a "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then
+         COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1=""
+     fi
+ 
      COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
      if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
***************
*** 13297,13305 ****
      fi
  
-     COND_SHARED_1_USE_LUAMODULE_1="#"
-     if test "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then
-         COND_SHARED_1_USE_LUAMODULE_1=""
-     fi
- 
      COND_SHARED_1_USE_SYSTEM_LUA_0="#"
      if test "x$SHARED" = "x1" -a "x$USE_SYSTEM_LUA" = "x0" ; then
--- 13330,13333 ----
***************
*** 14309,14312 ****
--- 14337,14342 ----
  COND_ICC_PCH_1!$COND_ICC_PCH_1$ac_delim
  COND_INSTALL_CUSTOM_WXBIND_1!$COND_INSTALL_CUSTOM_WXBIND_1$ac_delim
+ COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1!$COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1$ac_delim
+ COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1!$COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1$ac_delim
  COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim
  COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim
***************
*** 14332,14336 ****
  COND_SHARED_0_USE_WXLUASOCKET_1!$COND_SHARED_0_USE_WXLUASOCKET_1$ac_delim
  COND_SHARED_1!$COND_SHARED_1$ac_delim
- COND_SHARED_1_USE_LUAMODULE_1!$COND_SHARED_1_USE_LUAMODULE_1$ac_delim
  COND_SHARED_1_USE_SYSTEM_LUA_0!$COND_SHARED_1_USE_SYSTEM_LUA_0$ac_delim
  COND_SHARED_1_USE_WXBINDADV_1!$COND_SHARED_1_USE_WXBINDADV_1$ac_delim
--- 14362,14365 ----
***************
*** 14352,14356 ****
  COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim
  COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim
- COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
  _ACEOF
  
--- 14381,14384 ----
***************
*** 14394,14397 ****
--- 14422,14426 ----
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+ COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
  COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
  COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
***************
*** 14406,14410 ****
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
      break
    elif $ac_last_try; then
--- 14435,14439 ----
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
      break
    elif $ac_last_try; then
***************
*** 14786,14789 ****
--- 14815,14822 ----
  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'
+ 
          if [ "x$USE_SYSTEM_LUA" = "x0" ]; then
              echo "  - Lua interpreter:                yes"
***************
*** 14804,14807 ****
--- 14837,14842 ----
  
  
+ # these use "normal" versions of the macros
+ 
          if [ "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ]; then
              echo "  - wxLua application:              yes"
***************
*** 14966,14972 ****
  
          if [ "x$USE_WXLUADEBUG" = "x1" ]; then
!             echo "  - enable_wxluadebug module:       yes"
          elif [ "x$USE_WXLUADEBUG" = "x0" ]; then
!             echo "  - enable_wxluadebug module:       no"
          else
              echo "USE_WXLUADEBUG is $USE_WXLUADEBUG"
--- 15001,15007 ----
  
          if [ "x$USE_WXLUADEBUG" = "x1" ]; then
!             echo "  - enable_wxluadebug module:           yes"
          elif [ "x$USE_WXLUADEBUG" = "x0" ]; then
!             echo "  - enable_wxluadebug module:           no"
          else
              echo "USE_WXLUADEBUG is $USE_WXLUADEBUG"
***************
*** 14975,14981 ****
  
          if [ "x$USE_WXLUASOCKET" = "x1" ]; then
!             echo "  - enable_wxluasocket module:      yes"
          elif [ "x$USE_WXLUASOCKET" = "x0" ]; then
!             echo "  - enable_wxluasocket module:      no"
          else
              echo "USE_WXLUASOCKET is $USE_WXLUASOCKET"
--- 15010,15016 ----
  
          if [ "x$USE_WXLUASOCKET" = "x1" ]; then
!             echo "  - enable_wxluasocket module:          yes"
          elif [ "x$USE_WXLUASOCKET" = "x0" ]; then
!             echo "  - enable_wxluasocket module:          no"
          else
              echo "USE_WXLUASOCKET is $USE_WXLUASOCKET"
***************
*** 14984,14990 ****
  
          if [ "x$USE_LUAMODULE" = "x1" ]; then
!             echo "  - enable_luamodule module:        yes"
          elif [ "x$USE_LUAMODULE" = "x0" ]; then
!             echo "  - enable_luamodule module:        no"
          else
              echo "USE_LUAMODULE is $USE_LUAMODULE"
--- 15019,15025 ----
  
          if [ "x$USE_LUAMODULE" = "x1" ]; then
!             echo "  - enable_luamodule module:            yes"
          elif [ "x$USE_LUAMODULE" = "x0" ]; then
!             echo "  - enable_luamodule module:            no"
          else
              echo "USE_LUAMODULE is $USE_LUAMODULE"
***************
*** 14992,14995 ****
--- 15027,15039 ----
  
  
+         if [ "x$MONOLITHIC_LUAMODULE" = "x1" ]; then
+             echo "  - enable_monolithic_luamodule module: yes"
+         elif [ "x$MONOLITHIC_LUAMODULE" = "x0" ]; then
+             echo "  - enable_monolithic_luamodule module: no"
+         else
+             echo "MONOLITHIC_LUAMODULE is $MONOLITHIC_LUAMODULE"
+         fi
+ 
+ 
  # miscellaneous
  echo