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/11/12 18:20:28 UTC
svn commit: r1201285 - in /tcl/rivet/trunk: ChangeLog Makefile.in
configure.ac doc/xml/commands.xml src/apache-2/rivetCore.c
tclconfig/ltmain.sh
Author: mxmanghi
Date: Sat Nov 12 17:20:28 2011
New Revision: 1201285
URL: http://svn.apache.org/viewvc?rev=1201285&view=rev
Log:
2011-11-12 Massimo Manghi <mx...@apache.org>
* src/apache-2/rivetCore.c: reindented to improve readability.
* doc/xml/commands.xml: typo corrected
* tclconfig/ltmain.sh: new script from recently released libtools
* configure.ac: new macro AC_CONFIG_MACRO_DIR to include macros in m4
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/configure.ac
tcl/rivet/trunk/doc/xml/commands.xml
tcl/rivet/trunk/src/apache-2/rivetCore.c
tcl/rivet/trunk/tclconfig/ltmain.sh
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1201285&r1=1201284&r2=1201285&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Sat Nov 12 17:20:28 2011
@@ -1,3 +1,9 @@
+2011-11-12 Massimo Manghi <mx...@apache.org>
+ * src/apache-2/rivetCore.c: reindented to improve readability.
+ * doc/xml/commands.xml: typo corrected
+ * tclconfig/ltmain.sh: new script from recently released libtools
+ * configure.ac: new macro AC_CONFIG_MACRO_DIR to include macros in m4
+
2011-10-12 Massimo Manghi <mx...@apache.org>
* debian/*: actually removed from trunk (yesterday it was removed from branches/2.0)
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1201285&r1=1201284&r2=1201285&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Sat Nov 12 17:20:28 2011
@@ -51,7 +51,9 @@ 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)/acinclude.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 \
$(top_srcdir)/tclconfig/libtool.m4 \
$(top_srcdir)/m4/ax_prefix_config_h.m4 \
Modified: tcl/rivet/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/configure.ac?rev=1201285&r1=1201284&r2=1201285&view=diff
==============================================================================
--- tcl/rivet/trunk/configure.ac (original)
+++ tcl/rivet/trunk/configure.ac Sat Nov 12 17:20:28 2011
@@ -28,6 +28,7 @@ TEA_INIT([3.9])
AC_CONFIG_AUX_DIR(tclconfig)
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
# AX_PREFIX_CONFIG_H is a macro taken from the autotools macro archive.
# The typical configure generated 'config.h' can be renamed and
Modified: tcl/rivet/trunk/doc/xml/commands.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/commands.xml?rev=1201285&r1=1201284&r2=1201285&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/commands.xml (original)
+++ tcl/rivet/trunk/doc/xml/commands.xml Sat Nov 12 17:20:28 2011
@@ -933,7 +933,7 @@ bxxb ccxxxxcc
<listitem> No argument is passed to the command (returns the current script URL)</listitem>
<listitem>
A relative style path is passed (returns the argument prepended with the
- current script's URL
+ current script's URL)
</listitem>
<listitem>
An absolute path is passed to the command: (returns the full URL to the
Modified: tcl/rivet/trunk/src/apache-2/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/rivetCore.c?rev=1201285&r1=1201284&r2=1201285&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/rivetCore.c (original)
+++ tcl/rivet/trunk/src/apache-2/rivetCore.c Sat Nov 12 17:20:28 2011
@@ -8,7 +8,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -63,13 +63,13 @@ extern char* TclWeb_GetRawPost (TclWebRe
*
* Rivet_MakeURL --
*
- * Make a self-referencing URL.
+ * Make a self-referencing URL.
*
* Results:
- * Standard Tcl result.
+ * Standard Tcl result.
*
* Side Effects:
- * None.
+ * None.
*
*-----------------------------------------------------------------------------
*/
@@ -83,8 +83,8 @@ TCL_CMD_HEADER( Rivet_MakeURL )
if (objc > 2)
{
- Tcl_WrongNumArgs(interp, 1, objv, "filename");
- return TCL_ERROR;
+ Tcl_WrongNumArgs(interp, 1, objv, "filename");
+ return TCL_ERROR;
}
if (objc == 1)
@@ -105,14 +105,14 @@ TCL_CMD_HEADER( Rivet_MakeURL )
char* script_name = TclWeb_GetEnvVar (globals->req,"SCRIPT_NAME");
int script_name_l = strlen(script_name);
- // regardless the reason for a SCRIPT_NAME being undefined we
+ // regardless the reason for SCRIPT_NAME being undefined we
// prevent a segfault and we revert the behavior of makeurl
// to the case of an absolute path
if (script_name_l > 0)
{
- // script name may have the form a directory path (and mod_rewrite
- // could have mapped it to a .tcl or .rvt script
+ // script name may have the form of a directory path (and mod_rewrite
+ // could have mapped it to a .tcl or .rvt script)
if (script_name[script_name_l-1] == '/')
{
@@ -142,22 +142,22 @@ TCL_CMD_HEADER( Rivet_MakeURL )
*
* Rivet_Parse --
*
- * Include and parse a Rivet file.
+ * Include and parse a Rivet file.
*
* Results:
- * Standard Tcl result.
+ * Standard Tcl result.
*
* Side Effects:
- * Whatever occurs in the Rivet page parsed.
+ * Whatever occurs in the Rivet page parsed.
*
*-----------------------------------------------------------------------------
*/
TCL_CMD_HEADER( Rivet_Parse )
{
- char *filename;
+ char *filename;
apr_status_t stat_s;
- apr_finfo_t finfo_b;
+ apr_finfo_t finfo_b;
rivet_interp_globals *globals = Tcl_GetAssocData(interp, "rivet", NULL);
@@ -186,7 +186,7 @@ TCL_CMD_HEADER( Rivet_Parse )
stat_s = apr_stat(&finfo_b,filename,APR_FINFO_NORM,globals->r->pool);
if (stat_s != APR_SUCCESS)
{
- char apr_error_message[256];
+ char apr_error_message[256];
Tcl_AddErrorInfo(interp,apr_strerror(stat_s,apr_error_message,256));
return TCL_ERROR;
@@ -204,14 +204,14 @@ TCL_CMD_HEADER( Rivet_Parse )
*
* Rivet_Include --
*
- * Includes a file literally in the output stream. Useful for
- * images, plain HTML and the like.
+ * Includes a file literally in the output stream. Useful for
+ * images, plain HTML and the like.
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * Adds to the output stream.
+ * Adds to the output stream.
*
*-----------------------------------------------------------------------------
*/
@@ -230,19 +230,19 @@ TCL_CMD_HEADER( Rivet_Include )
if( objc < 2 || objc > 3 )
{
- Tcl_WrongNumArgs(interp, 1, objv, "?-virtual? filename");
- return TCL_ERROR;
+ Tcl_WrongNumArgs(interp, 1, objv, "?-virtual? filename");
+ return TCL_ERROR;
}
if( objc == 2 ) {
- filename = Tcl_GetStringFromObj( objv[1], (int *)NULL );
+ filename = Tcl_GetStringFromObj( objv[1], (int *)NULL );
} else {
- if( !STREQU( Tcl_GetStringFromObj(objv[1], (int *)NULL), "-virtual") ) {
- Tcl_WrongNumArgs( interp, 1, objv, "?-virtual? filename" );
- return TCL_ERROR;
- }
- filename = TclWeb_GetVirtualFile( globals->req,
- Tcl_GetStringFromObj(objv[2], (int *)NULL) );
+ if( !STREQU( Tcl_GetStringFromObj(objv[1], (int *)NULL), "-virtual") ) {
+ Tcl_WrongNumArgs( interp, 1, objv, "?-virtual? filename" );
+ return TCL_ERROR;
+ }
+ filename = TclWeb_GetVirtualFile( globals->req,
+ Tcl_GetStringFromObj(objv[2], (int *)NULL) );
}
fd = Tcl_OpenFileChannel(interp, filename, "r", 0664);
@@ -258,9 +258,9 @@ TCL_CMD_HEADER( Rivet_Include )
sz = Tcl_ReadChars(fd, outobj, -1, 0);
if (sz == -1)
{
- Tcl_AddErrorInfo(interp, Tcl_PosixError(interp));
- Tcl_DecrRefCount(outobj);
- return TCL_ERROR;
+ Tcl_AddErrorInfo(interp, Tcl_PosixError(interp));
+ Tcl_DecrRefCount(outobj);
+ return TCL_ERROR;
}
/* What we are doing is saving the translation and encoding
@@ -286,13 +286,13 @@ TCL_CMD_HEADER( Rivet_Include )
*
* Rivet_Headers --
*
- * Command to manipulate HTTP headers from Tcl.
+ * Command to manipulate HTTP headers from Tcl.
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * None.
+ * None.
*
*-----------------------------------------------------------------------------
*/
@@ -304,71 +304,71 @@ TCL_CMD_HEADER( Rivet_Headers )
if (objc < 2)
{
- Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
- return TCL_ERROR;
+ Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
+ return TCL_ERROR;
}
if (globals->req->headers_printed != 0)
{
- Tcl_AddObjErrorInfo(interp,
- "Cannot manipulate headers - already sent", -1);
- return TCL_ERROR;
+ Tcl_AddObjErrorInfo(interp,
+ "Cannot manipulate headers - already sent", -1);
+ return TCL_ERROR;
}
opt = Tcl_GetStringFromObj(objv[1], NULL);
if (!strcmp("redirect", opt)) /* ### redirect ### */
{
- if (objc != 3)
- {
- Tcl_WrongNumArgs(interp, 2, objv, "new-url");
- return TCL_ERROR;
- }
- apr_table_set(globals->r->headers_out, "Location",
- Tcl_GetStringFromObj (objv[2], (int *)NULL));
- TclWeb_SetStatus(301, globals->req);
- return TCL_RETURN;
+ if (objc != 3)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, "new-url");
+ return TCL_ERROR;
+ }
+ apr_table_set(globals->r->headers_out, "Location",
+ Tcl_GetStringFromObj (objv[2], (int *)NULL));
+ TclWeb_SetStatus(301, globals->req);
+ return TCL_RETURN;
}
else if (!strcmp("set", opt)) /* ### set ### */
{
- if (objc != 4)
- {
- Tcl_WrongNumArgs(interp, 2, objv, "headername value");
- return TCL_ERROR;
- }
- TclWeb_HeaderSet(Tcl_GetString(objv[2]), Tcl_GetString(objv[3]), globals->req);
+ if (objc != 4)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, "headername value");
+ return TCL_ERROR;
+ }
+ TclWeb_HeaderSet(Tcl_GetString(objv[2]), Tcl_GetString(objv[3]), globals->req);
}
else if (!strcmp("add", opt)) /* ### set ### */
{
- if (objc != 4)
- {
- Tcl_WrongNumArgs(interp, 2, objv, "headername value");
- return TCL_ERROR;
- }
- TclWeb_HeaderAdd(Tcl_GetString(objv[2]), Tcl_GetString(objv[3]), globals->req);
+ if (objc != 4)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, "headername value");
+ return TCL_ERROR;
+ }
+ TclWeb_HeaderAdd(Tcl_GetString(objv[2]), Tcl_GetString(objv[3]), globals->req);
}
else if (!strcmp("type", opt)) /* ### set ### */
{
- if (objc != 3)
- {
- Tcl_WrongNumArgs(interp, 2, objv, "mime/type");
- return TCL_ERROR;
- }
- TclWeb_SetHeaderType(Tcl_GetString(objv[2]), globals->req);
+ if (objc != 3)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, "mime/type");
+ return TCL_ERROR;
+ }
+ TclWeb_SetHeaderType(Tcl_GetString(objv[2]), globals->req);
} else if (!strcmp("numeric", opt)) /* ### numeric ### */
{
- int st = 200;
+ int st = 200;
- if (objc != 3)
- {
- Tcl_WrongNumArgs(interp, 2, objv, "response_code_number");
- return TCL_ERROR;
- }
- if (Tcl_GetIntFromObj(interp, objv[2], &st) != TCL_ERROR) {
- TclWeb_SetStatus(st, globals->req);
- } else {
- return TCL_ERROR;
- }
+ if (objc != 3)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, "response_code_number");
+ return TCL_ERROR;
+ }
+ if (Tcl_GetIntFromObj(interp, objv[2], &st) != TCL_ERROR) {
+ TclWeb_SetStatus(st, globals->req);
} else {
- return TCL_ERROR;
+ return TCL_ERROR;
+ }
+ } else {
+ return TCL_ERROR;
}
return TCL_OK;
}
@@ -378,16 +378,16 @@ TCL_CMD_HEADER( Rivet_Headers )
*
* Rivet_LoadEnv --
*
- * Load the "environmental variables" - those variables that are
- * set in the environment in a standard CGI program. If no array
- * name is supplied, they are loaded into an array whose name is
- * the value of the ENV_ARRAY_NAME #define.
+ * Load the "environmental variables" - those variables that are
+ * set in the environment in a standard CGI program. If no array
+ * name is supplied, they are loaded into an array whose name is
+ * the value of the ENV_ARRAY_NAME #define.
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * None.
+ * None.
*
*-----------------------------------------------------------------------------
*/
@@ -398,14 +398,14 @@ TCL_CMD_HEADER( Rivet_LoadEnv )
rivet_interp_globals *globals = Tcl_GetAssocData(interp, "rivet", NULL);
if( objc > 2 ) {
- Tcl_WrongNumArgs( interp, 1, objv, "?arrayName?" );
- return TCL_ERROR;
+ Tcl_WrongNumArgs( interp, 1, objv, "?arrayName?" );
+ return TCL_ERROR;
}
if( objc == 2 ) {
- ArrayObj = objv[1];
+ ArrayObj = objv[1];
} else {
- ArrayObj = Tcl_NewStringObj( ENV_ARRAY_NAME, -1 );
+ ArrayObj = Tcl_NewStringObj( ENV_ARRAY_NAME, -1 );
}
return TclWeb_GetEnvVars(ArrayObj, globals->req);
@@ -416,15 +416,15 @@ TCL_CMD_HEADER( Rivet_LoadEnv )
*
* Rivet_LoadHeaders --
*
- * Load the HTTP headers supplied by the client into a Tcl array,
- * whose name defaults to the value of the HEADERS_ARRAY_NAME
- * #define.
+ * Load the HTTP headers supplied by the client into a Tcl array,
+ * whose name defaults to the value of the HEADERS_ARRAY_NAME
+ * #define.
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * Creates an array variable if none exists.
+ * Creates an array variable if none exists.
*
*-----------------------------------------------------------------------------
*/
@@ -435,14 +435,14 @@ TCL_CMD_HEADER ( Rivet_LoadHeaders )
rivet_interp_globals *globals = Tcl_GetAssocData(interp, "rivet", NULL);
if( objc > 2 ) {
- Tcl_WrongNumArgs( interp, 1, objv, "?arrayName?" );
- return TCL_ERROR;
+ Tcl_WrongNumArgs( interp, 1, objv, "?arrayName?" );
+ return TCL_ERROR;
}
if( objc == 2 ) {
- ArrayObj = objv[1];
+ ArrayObj = objv[1];
} else {
- ArrayObj = Tcl_NewStringObj( HEADERS_ARRAY_NAME, -1 );
+ ArrayObj = Tcl_NewStringObj( HEADERS_ARRAY_NAME, -1 );
}
return TclWeb_GetHeaderVars(ArrayObj, globals->req);
@@ -458,19 +458,19 @@ TCL_CMD_HEADER ( Rivet_LoadHeaders )
*
* Rivet_Var --
*
- * Returns information about GET or POST variables:
+ * Returns information about GET or POST variables:
*
- * var get foo ?default?
- * var list foo
- * var names
- * var number
- * var all
+ * var get foo ?default?
+ * var list foo
+ * var names
+ * var number
+ * var all
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * None.
+ * None.
*
*-----------------------------------------------------------------------------
*/
@@ -485,10 +485,10 @@ TCL_CMD_HEADER ( Rivet_Var )
if (objc < 2 || objc > 4)
{
- Tcl_WrongNumArgs(interp, 1, objv,
- "(get varname ?default?|list varname|exists varname|names"
- "|number|all)");
- return TCL_ERROR;
+ Tcl_WrongNumArgs(interp, 1, objv,
+ "(get varname ?default?|list varname|exists varname|names"
+ "|number|all)");
+ return TCL_ERROR;
}
cmd = Tcl_GetString(objv[0]);
command = Tcl_GetString(objv[1]);
@@ -501,84 +501,84 @@ TCL_CMD_HEADER ( Rivet_Var )
if (!strcmp(command, "get"))
{
- char *key = NULL;
- char *deflt = NULL;
- if (objc != 3 && objc != 4)
- {
- Tcl_WrongNumArgs(interp, 2, objv, "variablename ?defaultval?");
- return TCL_ERROR;
- }
- key = Tcl_GetStringFromObj(objv[2], NULL);
- if (objc == 4)
- {
- deflt = Tcl_GetString(objv[3]);
- }
-
- if (TclWeb_GetVar(result, key, source, globals->req) != TCL_OK)
- {
- if (deflt == NULL) {
- Tcl_SetStringObj(result, "", -1);
- } else {
- Tcl_SetStringObj(result, deflt, -1);
- }
- }
+ char *key = NULL;
+ char *deflt = NULL;
+ if (objc != 3 && objc != 4)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, "variablename ?defaultval?");
+ return TCL_ERROR;
+ }
+ key = Tcl_GetStringFromObj(objv[2], NULL);
+ if (objc == 4)
+ {
+ deflt = Tcl_GetString(objv[3]);
+ }
+
+ if (TclWeb_GetVar(result, key, source, globals->req) != TCL_OK)
+ {
+ if (deflt == NULL) {
+ Tcl_SetStringObj(result, "", -1);
+ } else {
+ Tcl_SetStringObj(result, deflt, -1);
+ }
+ }
} else if(!strcmp(command, "exists")) {
- char *key;
- if (objc != 3)
- {
- Tcl_WrongNumArgs(interp, 2, objv, "variablename");
- return TCL_ERROR;
- }
- key = Tcl_GetString(objv[2]);
+ char *key;
+ if (objc != 3)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, "variablename");
+ return TCL_ERROR;
+ }
+ key = Tcl_GetString(objv[2]);
- TclWeb_VarExists(result, key, source, globals->req);
+ TclWeb_VarExists(result, key, source, globals->req);
} else if(!strcmp(command, "list")) {
- char *key;
- if (objc != 3)
- {
- Tcl_WrongNumArgs(interp, 2, objv, "variablename");
- return TCL_ERROR;
- }
- key = Tcl_GetStringFromObj(objv[2], NULL);
-
- if (TclWeb_GetVarAsList(result, key, source, globals->req) != TCL_OK)
- {
- result = Tcl_NewStringObj("", -1);
- }
+ char *key;
+ if (objc != 3)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, "variablename");
+ return TCL_ERROR;
+ }
+ key = Tcl_GetStringFromObj(objv[2], NULL);
+
+ if (TclWeb_GetVarAsList(result, key, source, globals->req) != TCL_OK)
+ {
+ result = Tcl_NewStringObj("", -1);
+ }
} else if(!strcmp(command, "names")) {
- if (objc != 2)
- {
- Tcl_WrongNumArgs(interp, 2, objv, NULL);
- return TCL_ERROR;
- }
-
- if (TclWeb_GetVarNames(result, source, globals->req) != TCL_OK)
- {
- result = Tcl_NewStringObj("", -1);
- }
+ if (objc != 2)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, NULL);
+ return TCL_ERROR;
+ }
+
+ if (TclWeb_GetVarNames(result, source, globals->req) != TCL_OK)
+ {
+ result = Tcl_NewStringObj("", -1);
+ }
} else if(!strcmp(command, "number")) {
- if (objc != 2)
- {
- Tcl_WrongNumArgs(interp, 2, objv, NULL);
- return TCL_ERROR;
- }
+ if (objc != 2)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, NULL);
+ return TCL_ERROR;
+ }
- TclWeb_VarNumber(result, source, globals->req);
+ TclWeb_VarNumber(result, source, globals->req);
} else if(!strcmp(command, "all")) {
- if (objc != 2)
- {
- Tcl_WrongNumArgs(interp, 2, objv, NULL);
- return TCL_ERROR;
- }
- if (TclWeb_GetAllVars(result, source, globals->req) != TCL_OK)
- {
- result = Tcl_NewStringObj("", -1);
- }
+ if (objc != 2)
+ {
+ Tcl_WrongNumArgs(interp, 2, objv, NULL);
+ return TCL_ERROR;
+ }
+ if (TclWeb_GetAllVars(result, source, globals->req) != TCL_OK)
+ {
+ result = Tcl_NewStringObj("", -1);
+ }
} else {
- /* bad command */
- Tcl_AppendResult(interp, "bad option: must be one of ",
- "'get, list, names, number, all'", NULL);
- return TCL_ERROR;
+ /* bad command */
+ Tcl_AppendResult(interp, "bad option: must be one of ",
+ "'get, list, names, number, all'", NULL);
+ return TCL_ERROR;
}
Tcl_SetObjResult(interp, result);
@@ -611,9 +611,9 @@ append_key_value_callback (void *data, c
*
* Rivet_ApacheTable --
*
- * Deals with Rivet key-value tables in the request structure
+ * Deals with Rivet key-value tables in the request structure
*
- * apache_table get tablename key
+ * apache_table get tablename key
* apache_table set tablename key value
* apache_table set tablename list
* apache_table exists tablename key
@@ -626,7 +626,7 @@ append_key_value_callback (void *data, c
* "err_headers_out", and "subprocess_env".
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
*
@@ -687,14 +687,14 @@ TCL_CMD_HEADER( Rivet_ApacheTable )
if (Tcl_GetIndexFromObj(interp, objv[1],SubCommand,
"get|set|unset|list",
- 0, &subcommandindex) == TCL_ERROR) {
+ 0, &subcommandindex) == TCL_ERROR) {
return TCL_ERROR;
}
if (Tcl_GetIndexFromObj (interp, objv[2], tableNames,
"notes|headers_in|headers_out|err_header_out|subprocess_env",
0, &tableindex) == TCL_ERROR) {
- return TCL_ERROR;
+ return TCL_ERROR;
}
switch ((enum tablename)tableindex)
@@ -844,23 +844,23 @@ TCL_CMD_HEADER( Rivet_ApacheTable )
*
* Rivet_Upload --
*
- * Deals with file uploads (multipart/form-data) like so:
+ * Deals with file uploads (multipart/form-data) like so:
*
- * upload channel uploadname
- * upload save name uploadname
- * upload data uploadname
- * upload exists uploadname
- * upload size uploadname
- * upload type uploadname
- * upload filename uploadname
- * upload names
+ * upload channel uploadname
+ * upload save name uploadname
+ * upload data uploadname
+ * upload exists uploadname
+ * upload size uploadname
+ * upload type uploadname
+ * upload filename uploadname
+ * upload names
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * Has the potential to create files on the file system, or work
- * with large amounts of data.
+ * Has the potential to create files on the file system, or work
+ * with large amounts of data.
*
*-----------------------------------------------------------------------------
*/
@@ -900,23 +900,23 @@ TCL_CMD_HEADER( Rivet_Upload )
rivet_interp_globals *globals = Tcl_GetAssocData(interp, "rivet", NULL);
if (Tcl_GetIndexFromObj(interp, objv[1], SubCommand,
- "channel|save|data|exists|size|type|filename|names|tempname"
- "|tempname|names",
- 0, &subcommandindex) == TCL_ERROR) {
- return TCL_ERROR;
+ "channel|save|data|exists|size|type|filename|names|tempname"
+ "|tempname|names",
+ 0, &subcommandindex) == TCL_ERROR) {
+ return TCL_ERROR;
}
/* If it's any of these, we need to find a specific name. */
/* Excluded case is NAMES. */
- if ((enum subcommand)subcommandindex == CHANNEL ||
- (enum subcommand)subcommandindex == SAVE ||
- (enum subcommand)subcommandindex == DATA ||
- (enum subcommand)subcommandindex == EXISTS ||
- (enum subcommand)subcommandindex == SIZE ||
- (enum subcommand)subcommandindex == TYPE ||
- (enum subcommand)subcommandindex == FILENAME ||
+ if ((enum subcommand)subcommandindex == CHANNEL ||
+ (enum subcommand)subcommandindex == SAVE ||
+ (enum subcommand)subcommandindex == DATA ||
+ (enum subcommand)subcommandindex == EXISTS ||
+ (enum subcommand)subcommandindex == SIZE ||
+ (enum subcommand)subcommandindex == TYPE ||
+ (enum subcommand)subcommandindex == FILENAME ||
(enum subcommand)subcommandindex == TEMPNAME)
{
varname = Tcl_GetString(objv[2]);
@@ -1030,13 +1030,13 @@ TCL_CMD_HEADER( Rivet_Upload )
*
* Rivet_RawPost --
*
- * Returns the raw POST data.
+ * Returns the raw POST data.
*
* Results:
- * The raw post data, or an empty string if there is none.
+ * The raw post data, or an empty string if there is none.
*
* Side Effects:
- * None.
+ * None.
*
*-----------------------------------------------------------------------------
*/
@@ -1062,14 +1062,14 @@ TCL_CMD_HEADER ( Rivet_RawPost )
*
* Rivet_NoBody --
*
- * Tcl command to erase body, so that only header is returned.
- * Necessary for 304 responses.
+ * Tcl command to erase body, so that only header is returned.
+ * Necessary for 304 responses.
*
* Results:
- * A standard Tcl return value.
+ * A standard Tcl return value.
*
* Side Effects:
- * Eliminates any body returned in the HTTP response.
+ * Eliminates any body returned in the HTTP response.
*
*-----------------------------------------------------------------------------
*/
@@ -1092,16 +1092,16 @@ TCL_CMD_HEADER( Rivet_NoBody )
*
* Rivet_AbortPageCmd --
*
- * Similar in purpose to PHP's "die" command, which halts all
- * further output to the user. Like an "exit" for web pages, but
- * without actually exiting the apache child.
+ * Similar in purpose to PHP's "die" command, which halts all
+ * further output to the user. Like an "exit" for web pages, but
+ * without actually exiting the apache child.
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * Flushes the standard (apache) output channel, and tells apache
- * to stop sending data.
+ * Flushes the standard (apache) output channel, and tells apache
+ * to stop sending data.
*
*-----------------------------------------------------------------------------
*/
@@ -1186,14 +1186,14 @@ TCL_CMD_HEADER( Rivet_AbortCodeCmd )
*
* Rivet_EnvCmd --
*
- * Loads a single environmental variable, to avoid the overhead
- * of storing all of them when only one is needed.
+ * Loads a single environmental variable, to avoid the overhead
+ * of storing all of them when only one is needed.
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * None.
+ * None.
*
*-----------------------------------------------------------------------------
*/
@@ -1222,14 +1222,14 @@ TCL_CMD_HEADER( Rivet_EnvCmd )
*
* Rivet_VirtualFilenameCmd --
*
- * Gets file according to its relationship with the request's
- * root. (FIXME - check this).
+ * Gets file according to its relationship with the request's
+ * root. (FIXME - check this).
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * None.
+ * None.
*
*-----------------------------------------------------------------------------
*/
@@ -1257,9 +1257,9 @@ TCL_CMD_HEADER( Rivet_VirtualFilenameCmd
*
* Rivet_LogError --
*
- * Log an error from Rivet
+ * Log an error from Rivet
*
- * log_error priority message
+ * log_error priority message
*
* priority can be one of "emerg", "alert", "crit", "err",
* "warning", "notice", "info", "debug"
@@ -1280,40 +1280,40 @@ TCL_CMD_HEADER( Rivet_LogErrorCmd )
int apLogLevel = 0;
static CONST84 char *logLevel[] = {
- "emerg",
- "alert",
- "crit",
- "err",
- "warning",
- "notice",
- "info",
- "debug",
- NULL
+ "emerg",
+ "alert",
+ "crit",
+ "err",
+ "warning",
+ "notice",
+ "info",
+ "debug",
+ NULL
};
enum loglevel {
- EMERG,
- ALERT,
- CRIT,
- ERR,
- WARNING,
- NOTICE,
- INFO,
- DEBUG
+ EMERG,
+ ALERT,
+ CRIT,
+ ERR,
+ WARNING,
+ NOTICE,
+ INFO,
+ DEBUG
};
rivet_interp_globals *globals = Tcl_GetAssocData(interp, "rivet", NULL);
if( objc != 3 ) {
- Tcl_WrongNumArgs( interp, 1, objv, "loglevel message" );
- return TCL_ERROR;
+ Tcl_WrongNumArgs( interp, 1, objv, "loglevel message" );
+ return TCL_ERROR;
}
message = Tcl_GetString (objv[2]);
if (Tcl_GetIndexFromObj(interp, objv[1], logLevel,
- "emerg|alert|crit|err|warning|notice|info|debug",
- 0, &loglevelindex) == TCL_ERROR) {
- return TCL_ERROR;
+ "emerg|alert|crit|err|warning|notice|info|debug",
+ 0, &loglevelindex) == TCL_ERROR) {
+ return TCL_ERROR;
}
switch ((enum loglevel)loglevelindex)
@@ -1368,23 +1368,23 @@ TCL_CMD_HEADER( Rivet_LogErrorCmd )
*
* TestpanicCmd --
*
- * Calls the panic routine.
+ * Calls the panic routine.
*
* Results:
* Always returns TCL_OK.
*
* Side effects:
- * May exit application.
+ * May exit application.
*
*----------------------------------------------------------------------
*/
static int
TestpanicCmd(dummy, interp, argc, argv)
- ClientData dummy; /* Not used. */
- Tcl_Interp *interp; /* Current interpreter. */
- int argc; /* Number of arguments. */
- CONST char **argv; /* Argument strings. */
+ ClientData dummy; /* Not used. */
+ Tcl_Interp *interp; /* Current interpreter. */
+ int argc; /* Number of arguments. */
+ CONST char **argv; /* Argument strings. */
{
CONST char *argString;
@@ -1406,13 +1406,13 @@ TestpanicCmd(dummy, interp, argc, argv)
*
* Rivet_InitCore --
*
- * Creates the core rivet commands.
+ * Creates the core rivet commands.
*
* Results:
- * A standard Tcl result.
+ * A standard Tcl result.
*
* Side Effects:
- * Creates new commands.
+ * Creates new commands.
*
*-----------------------------------------------------------------------------
*/
@@ -1421,94 +1421,94 @@ int
Rivet_InitCore( Tcl_Interp *interp )
{
Tcl_CreateObjCommand(interp,
- "makeurl",
- Rivet_MakeURL,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "makeurl",
+ Rivet_MakeURL,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "headers",
- Rivet_Headers,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "headers",
+ Rivet_Headers,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "load_env",
- Rivet_LoadEnv,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "load_env",
+ Rivet_LoadEnv,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "load_headers",
- Rivet_LoadHeaders,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "load_headers",
+ Rivet_LoadHeaders,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "var",
- Rivet_Var,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "var",
+ Rivet_Var,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "apache_table",
- Rivet_ApacheTable,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "apache_table",
+ Rivet_ApacheTable,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "var_qs",
- Rivet_Var,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "var_qs",
+ Rivet_Var,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "var_post",
- Rivet_Var,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "var_post",
+ Rivet_Var,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "raw_post",
- Rivet_RawPost,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "raw_post",
+ Rivet_RawPost,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "upload",
- Rivet_Upload,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "upload",
+ Rivet_Upload,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "include",
- Rivet_Include,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "include",
+ Rivet_Include,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "parse",
- Rivet_Parse,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "parse",
+ Rivet_Parse,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "no_body",
- Rivet_NoBody,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "no_body",
+ Rivet_NoBody,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "env",
- Rivet_EnvCmd,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "env",
+ Rivet_EnvCmd,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp,
- "apache_log_error",
- Rivet_LogErrorCmd,
- NULL,
- (Tcl_CmdDeleteProc *)NULL);
+ "apache_log_error",
+ Rivet_LogErrorCmd,
+ NULL,
+ (Tcl_CmdDeleteProc *)NULL);
#ifdef TESTPANIC
Tcl_CreateCommand(interp, "testpanic", TestpanicCmd, (ClientData) 0,
Modified: tcl/rivet/trunk/tclconfig/ltmain.sh
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tclconfig/ltmain.sh?rev=1201285&r1=1201284&r2=1201285&view=diff
==============================================================================
--- tcl/rivet/trunk/tclconfig/ltmain.sh (original)
+++ tcl/rivet/trunk/tclconfig/ltmain.sh Sat Nov 12 17:20:28 2011
@@ -1,9 +1,9 @@
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit <go...@gnu.ai.mit.edu>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -41,6 +41,7 @@
# --quiet, --silent don't print informational messages
# --no-quiet, --no-silent
# print informational messages (default)
+# --no-warn don't display warning messages
# --tag=TAG use configuration variables from tag TAG
# -v, --verbose print more informational messages than default
# --no-verbose don't print the extra informational messages
@@ -69,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4 Debian-2.4-2
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -79,9 +80,9 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2"
+VERSION="2.4.2 Debian-2.4.2-1"
TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -387,7 +383,7 @@ case $progpath in
;;
*)
save_IFS="$IFS"
- IFS=:
+ IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
p
d
}
@@ -1052,6 +1048,7 @@ opt_finish=false
opt_help=false
opt_help_all=false
opt_silent=:
+opt_warning=:
opt_verbose=:
opt_silent=false
opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
opt_silent=false
func_append preserve_args " $opt"
;;
+ --no-warning|--no-warn)
+ opt_warning=false
+func_append preserve_args " $opt"
+ ;;
--no-verbose)
opt_verbose=false
func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
# Set up the ranlib parameters.
oldlib="$destdir/$name"
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
if test -n "$stripme" && test -n "$old_striplib"; then
- func_show_eval "$old_striplib $oldlib" 'exit $?'
+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
fi
# Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup()
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
# launches target application with the remaining arguments.
func_exec_program ()
{
- for lt_wr_arg
- do
- case \$lt_wr_arg in
- --lt-*) ;;
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- esac
- shift
- done
+ case \" \$* \" in
+ *\\ --lt-*)
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done ;;
+ esac
func_exec_program_core \${1+\"\$@\"}
}
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
{
EOF
func_emit_wrapper yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
-
+ $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/ fputs ("\1", f);/p
+g
+D'
cat <<"EOF"
}
EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@ func_mode_link ()
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$dir"
+ add_dir="-L$absdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -7319,6 +7333,7 @@ func_mode_link ()
# which has an extra 1 added just for fun
#
case $version_type in
+ # correct linux to gnu/linux during the next big refactor
darwin|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
@@ -7438,7 +7453,7 @@ func_mode_link ()
versuffix="$major.$revision"
;;
- linux)
+ linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
@@ -8026,6 +8041,11 @@ EOF
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
+ # Remove ${wl} instances when linking with ld.
+ # FIXME: should test the right _cmds variable.
+ case $archive_cmds in
+ *\$LD\ *) wl= ;;
+ esac
if test "$hardcode_into_libs" = yes; then
# Hardcode the library paths
hardcode_libdirs=
@@ -8056,7 +8076,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
@@ -8064,11 +8084,7 @@ EOF
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
# We should set the runpath_var.
@@ -9158,6 +9174,8 @@ EOF
esac
done
fi
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
eval cmds=\"$old_archive_cmds\"
func_len " $cmds"
@@ -9267,7 +9285,8 @@ EOF
*.la)
func_basename "$deplib"
name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ func_resolve_sysroot "$deplib"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org