[Wxlua-commit] wxLua Makefile.in,1.16,1.17 configure,1.35,1.36

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-serv8798

Modified Files:
	Makefile.in configure 
Log Message:
updated all build system trying to fix SHARED builds

Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.in	8 May 2006 15:50:47 -0000	1.16
--- Makefile.in	20 May 2006 13:12:33 -0000	1.17
***************
*** 86,90 ****
  samples: 
  	@mkdir -p $(DESTDIR)$(datadir)/wxlua/samples
! 	@for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/calculator.wx.lua samples/debugtest.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \
  	if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \
  	then x=yep ; \
--- 86,90 ----
  samples: 
  	@mkdir -p $(DESTDIR)$(datadir)/wxlua/samples
! 	@for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debugtest.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \
  	if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \
  	then x=yep ; \

Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** configure	14 May 2006 12:55:55 -0000	1.35
--- configure	20 May 2006 13:12:33 -0000	1.36
***************
*** 311,315 ****
  #endif"

! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP LUA_PLATFORM_SPECIFIC_CFLAGS LUA_PLATFORM_SPECIFIC_LDFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_FULL WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT WX_GTKPORT_VERSION WXLIBS_REQUIRED WXLUA_MODNAMES WXLUA_LIBNAMES WXLUA_LDFLAGS SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_BUILD_DEBUG COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_UNICODE_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_INSTALL_CUSTOM_WXBIND_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_WXBINDSTC_1 COND_SHARED_0_USE_WXLUADEBUG_1 COND_SHARED_0_USE_WXLUASOCKET_1 COND_SHARED_1 COND_SHARED_1_USE_WXBINDSTC_1 COND_SHARED_1_USE_WXLUADEBUG_1 COND_SHARED_1_USE_WXLUASOCKET_1 COND_UNICODE_0 COND_UNICODE_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1 COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1 COND_USE_WXLUACANAPP_1 COND_USE_WXLUAFREEZEAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_PORT_GTK COND_WX_PORT_MAC COND_WX_PORT_MGL COND_WX_PORT_MOTIF COND_WX_PORT_MSW COND_WX_PORT_X11 LIBOBJS LTLIBOBJS'
  ac_subst_files=''

--- 311,315 ----
  #endif"

! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP LUA_PLATFORM_SPECIFIC_CFLAGS LUA_PLATFORM_SPECIFIC_LDFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_FULL WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT WX_GTKPORT_VERSION WXLIBS_REQUIRED WXLUA_MODNAMES WXLUA_LIBNAMES WXLUA_LDFLAGS SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_BUILD_DEBUG COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_UNICODE_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_INSTALL_CUSTOM_WXBIND_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_WXBINDSTC_1 COND_SHARED_0_USE_WXLUADEBUG_1 COND_SHARED_0_USE_WXLUASOCKET_1 COND_SHARED_1 COND_SHARED_1_USE_WXBINDSTC_1 COND_SHARED_1_USE_WXLUADEBUG_1 COND_SHARED_1_USE_WXLUASOCKET_1 COND_UNICODE_0 COND_UNICODE_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_LUAMODULE_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1 COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1 COND_USE_WXLUACANAPP_1 COND_USE_WXLUAFREEZEAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_PORT_GTK COND_WX_PORT_MAC COND_WX_PORT_MGL COND_WX_PORT_MOTIF COND_WX_PORT_MSW COND_WX_PORT_X11 LIBOBJS LTLIBOBJS'
  ac_subst_files=''

***************
*** 862,865 ****
--- 862,866 ----
    --enable-wxluafreeze-app
                            Compiles the wxLuaFreeze app (default is yes)
+   --enable-luamodule      Compiles the lua module (default is yes)
    --enable-wxbindstc      Compiles the wxLua bindings for STC (default is yes)
    --enable-wxluadebug     Compiles the wxLua debug support (default is yes)
***************
*** 1519,1522 ****
--- 1520,1530 ----
    enable_wxluafreeze_app=yes
  fi;
+ # Check whether --enable-luamodule or --disable-luamodule was given.
+ if test "${enable_luamodule+set}" = set; then
+   enableval="$enable_luamodule"
+ 
+ else
+   enable_luamodule_app=yes
+ fi;

***************
*** 1612,1615 ****
--- 1620,1636 ----

+         echo "$as_me:$LINENO: checking for --enable-luamodule option" >&5
+ echo $ECHO_N "checking for --enable-luamodule option... $ECHO_C" >&6
+         if [ "x$enable_luamodule_app" = "xyes" ]; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             USE_LUAMODULE=1
+         else
+             echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+             USE_LUAMODULE=0
+         fi
+ 
+ 

          echo "$as_me:$LINENO: checking for --enable-wxbindstc option" >&5
***************
*** 8817,8820 ****
--- 8838,8846 ----
      fi

+     COND_USE_LUAMODULE_1="#"
+     if test "x$USE_LUAMODULE" = "x1" ; then
+         COND_USE_LUAMODULE_1=""
+     fi
+ 
      COND_USE_SOSYMLINKS_1="#"
      if test "x$USE_SOSYMLINKS" = "x1" ; then
***************
*** 8913,8916 ****
--- 8939,8957 ----
                                          ac_config_files="$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
+ 
+     { echo "$as_me:$LINENO: configure: copying $srcdir/samples to ./samples" >&5
+ echo "$as_me: configure: copying $srcdir/samples to ./samples" >&6;}
+     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
+ 
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
***************
*** 9676,9679 ****
--- 9717,9721 ----
  s,@COND_USE_APPS_1@,$COND_USE_APPS_1,;t t
  s,@COND_USE_BIN2C_1@,$COND_USE_BIN2C_1,;t t
+ s,@COND_USE_LUAMODULE_1@,$COND_USE_LUAMODULE_1,;t t
  s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
  s,@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@,$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1,;t t
***************
*** 9965,9968 ****
--- 10007,10012 ----

+ 
+ 
  # output a nice summary of detected options
  # NOTE: keep build conditions in synch with bakefiles; e.g. app_wxlua is
***************
*** 10006,10009 ****
--- 10050,10054 ----

  # applications
+ echo

          if [ "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ]; then
***************
*** 10044,10047 ****
--- 10089,10093 ----

  # modules
+ echo

          if [ "x$USE_WXBINDSTC" = "x1" ]; then
***************
*** 10072,10075 ****
--- 10118,10132 ----

+         if [ "x$USE_LUAMODULE" = "x1" ]; then
+             echo "  - Lua module:               yes"
+         elif [ "x$USE_LUAMODULE" = "x0" ]; then
+             echo "  - Lua module:               no"
+         else
+             echo "USE_LUAMODULE is $USE_LUAMODULE"
+         fi
+ 
+ 
+ # miscellaneous
+ echo

          if [ "x$INSTALL_CUSTOM_WXBIND" = "x1" ]; then