You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2011/12/06 12:07:33 UTC
svn commit: r1210861 - in /tcl/rivet/branches/rivet-namespace: ChangeLog
Makefile.in configure.ac rivet/init.tcl src/apache-2/mod_rivet.c
Author: mxmanghi
Date: Tue Dec 6 11:07:33 2011
New Revision: 1210861
URL: http://svn.apache.org/viewvc?rev=1210861&view=rev
Log:
2011-12-06 Massimo Manghi <mx...@apache.org>
* configure_ac: add new test on Tcl version using AX_VERSION_COMPARE.
Modified:
tcl/rivet/branches/rivet-namespace/ChangeLog
tcl/rivet/branches/rivet-namespace/Makefile.in
tcl/rivet/branches/rivet-namespace/configure.ac
tcl/rivet/branches/rivet-namespace/rivet/init.tcl
tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c
Modified: tcl/rivet/branches/rivet-namespace/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/ChangeLog?rev=1210861&r1=1210860&r2=1210861&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/ChangeLog (original)
+++ tcl/rivet/branches/rivet-namespace/ChangeLog Tue Dec 6 11:07:33 2011
@@ -1,4 +1,7 @@
2011-12-06 Massimo Manghi <mx...@apache.org>
+ * configure_ac: add new test on Tcl version using AX_VERSION_COMPARE.
+
+2011-12-06 Massimo Manghi <mx...@apache.org>
* doc/xml/request.xml,doc/xml/install.xml: documenting new configure switches
2011-12-05 Massimo Manghi <mx...@apache.org>
Modified: tcl/rivet/branches/rivet-namespace/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/Makefile.in?rev=1210861&r1=1210860&r2=1210861&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/Makefile.in (original)
+++ tcl/rivet/branches/rivet-namespace/Makefile.in Tue Dec 6 11:07:33 2011
@@ -51,10 +51,8 @@ DIST_COMMON = README $(am__configure_dep
tclconfig/config.sub tclconfig/depcomp tclconfig/install-sh \
tclconfig/ltmain.sh tclconfig/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/tclconfig/tcl.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/tclconfig/tcl.m4 \
$(top_srcdir)/tclconfig/libtool.m4 \
$(top_srcdir)/m4/ax_prefix_config_h.m4 \
$(top_srcdir)/configure.ac
Modified: tcl/rivet/branches/rivet-namespace/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/configure.ac?rev=1210861&r1=1210860&r2=1210861&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/configure.ac (original)
+++ tcl/rivet/branches/rivet-namespace/configure.ac Tue Dec 6 11:07:33 2011
@@ -365,7 +365,25 @@ AC_DEFUN([APR_HANDLING],[
fi
])
-# apache version
+
+#--------------------------------------------------------------------
+# 6-Dec-2011: Introducing new ::rivet namespace. Some components
+# (namely RivetTcl, providing Tcl level initialization) are required
+# within mod_rivet.c. Unfortunalely Tcl < 8.5.10 loaded shared
+# libs exporting names that clashed with Apache's own namespace and,
+# hence we have to make sure we are running a Tcl compatible version.
+# (See bug #3216070). If you're running Tcl < 8.5.10 we won't go any
+# further ahead...
+
+AX_COMPARE_VERSION([$TCL_VERSION$TCL_PATCH_LEVEL],[lt],[8.5.10],[
+ AC_MSG_ERROR([Rivet 2.1 requires Tcl > 8.5.10 (current is $TCL_VERSION$TCL_PATCH_LEVEL)])
+] , [
+ AC_MSG_NOTICE([ok, we are running Tcl $TCL_VERSION$TCL_PATCH_LEVEL])
+])
+
+
+
+# APACHE_VERSION
#
# let's determine whether we are building for apache1.x or apache2.x.
# This variable has consequences on the default values for the remaining
@@ -381,7 +399,7 @@ AC_DEFUN([APACHE_VERSION],[
AC_MSG_CHECKING(for apache version)
if test "$with_apache_version" = "1"; then
- AC_MSG_ERROR([Apache 1.x no more supported])
+ AC_MSG_ERROR([Apache 1.x no more supported starting with Rivet 2.1])
else
AC_MSG_RESULT( building for apache 2.x )
AC_CONFIG_FILES([src/apache-2/Makefile])
Modified: tcl/rivet/branches/rivet-namespace/rivet/init.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/rivet/init.tcl?rev=1210861&r1=1210860&r2=1210861&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/rivet/init.tcl (original)
+++ tcl/rivet/branches/rivet-namespace/rivet/init.tcl Tue Dec 6 11:07:33 2011
@@ -185,12 +185,13 @@ interp alias {} ::incr0 {} incr
## Some commands (namely lassign) replace the native lassign command
## so we have to use the -force switch
-# Do we actually want to import everything? Since we cannot safely
-# require package rivetlib (see bug #3216070) those commands have
-# to be loaded separately and in case a 'namespace import ::rivet::*'
-# reissued.
+# Do we actually want to import everything? If Rivet was configured
+# to import the ::rivet namespace for compatibility we do it right away.
+# This option is not guaranteed to be supported in future versions.
if {[info exists module_conf(import_rivet_commands)] && $module_conf(import_rivet_commands)} {
namespace import -force ::rivet::*
}
+array unset module_conf
+
Modified: tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c?rev=1210861&r1=1210860&r2=1210861&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c Tue Dec 6 11:07:33 2011
@@ -943,7 +943,7 @@ Rivet_PerInterpInit(server_rec *s, rivet
/* If rivet was configured to export the ::rivet namespace commands we have to
* set the array variable ::rivet::module_conf(export_namespace_commands) before calling init.tcl
- * This variable will be unset after commands are exported.
+ * This array will be unset after commands are exported.
*/
Tcl_SetVar2Ex(interp,"module_conf","export_namespace_commands",Tcl_NewIntObj(RIVET_NAMESPACE_EXPORT),0);
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org