INN commit: branches/2.5 (9 files)
INN Commit
rra at isc.org
Fri Aug 14 18:32:41 UTC 2009
Date: Friday, August 14, 2009 @ 11:32:41
Author: iulius
Revision: 8561
Typo: interpretor -> interpreter.
Modified:
branches/2.5/Makefile.global.in
branches/2.5/configure.ac
branches/2.5/doc/pod/hacking.pod
branches/2.5/doc/pod/hook-perl.pod
branches/2.5/doc/pod/install.pod
branches/2.5/lib/perl.c
branches/2.5/m4/perl.m4
branches/2.5/m4/python.m4
branches/2.5/support/fixscript.in
-----------------------+
Makefile.global.in | 4 ++--
configure.ac | 2 +-
doc/pod/hacking.pod | 6 +++---
doc/pod/hook-perl.pod | 2 +-
doc/pod/install.pod | 2 +-
lib/perl.c | 2 +-
m4/perl.m4 | 2 +-
m4/python.m4 | 2 +-
support/fixscript.in | 16 ++++++++--------
9 files changed, 19 insertions(+), 19 deletions(-)
Modified: Makefile.global.in
===================================================================
--- Makefile.global.in 2009-08-14 18:31:09 UTC (rev 8560)
+++ Makefile.global.in 2009-08-14 18:32:41 UTC (rev 8561)
@@ -135,8 +135,8 @@
SHADOW_LIBS = @SHADOW_LIBS@
## Embedding support. Additional flags and libraries used when compiling
-## or linking portions of INN that support embedded interpretors, set by
-## configure based on what interpretor embeddings are selected.
+## or linking portions of INN that support embedded interpreters, set by
+## configure based on what interpreter embeddings are selected.
PERL_CPPFLAGS = @PERL_CPPFLAGS@ $(PERL_WARNINGS)
PERL_LIBS = $(abs_builddir)/lib/perl$(LIBSUFFIX).o @PERL_LIBS@
Modified: configure.ac
===================================================================
--- configure.ac 2009-08-14 18:31:09 UTC (rev 8560)
+++ configure.ac 2009-08-14 18:32:41 UTC (rev 8561)
@@ -192,7 +192,7 @@
AC_MSG_ERROR([--enable-tagged-hash conflicts with --enable-largefiles.])
fi
-dnl Checks for embedded interpretors.
+dnl Checks for embedded interpreters.
INN_ARG_PERL
INN_ARG_PYTHON
Modified: doc/pod/hacking.pod
===================================================================
--- doc/pod/hacking.pod 2009-08-14 18:31:09 UTC (rev 8560)
+++ doc/pod/hacking.pod 2009-08-14 18:32:41 UTC (rev 8561)
@@ -299,13 +299,13 @@
F<configure>-time information and configuration information from F<inn.conf> are
set by the B<innshellvars> support libraries, so the only system-specific
configuration that should have to be done is fixing the right path to the
-interpretor and adding a line to load the appropriate B<innshellvars>.
+interpreter and adding a line to load the appropriate B<innshellvars>.
F<support/fixscript>, built by F<configure>, does this. It takes a F<.in> file
and generates the final script (removing the F<.in>) by fixing the path to
-the interpretor on the first line and replacing the second line, whatever
+the interpreter on the first line and replacing the second line, whatever
it is, with code to load the B<innshellvars> appropriate for that
-interpretor. (If invoked with B<-i>, it just fixes the interpretor path.)
+interpreter. (If invoked with B<-i>, it just fixes the interpreter path.)
Scripts should use B<innshellvars> (via B<fixscript>) to get the right path and
the right variables whenever possible, rather than having F<configure>
Modified: doc/pod/hook-perl.pod
===================================================================
--- doc/pod/hook-perl.pod 2009-08-14 18:31:09 UTC (rev 8560)
+++ doc/pod/hook-perl.pod 2009-08-14 18:32:41 UTC (rev 8561)
@@ -184,7 +184,7 @@
innd by dumping state to disk when NewMode is shutdown and then reloading
it when innd restarts (possibly by F<startup_innd.pl>).
-The state of the Perl interpretor in which all of these Perl functions run
+The state of the Perl interpreter in which all of these Perl functions run
is preserved over the lifetime of innd. In other words, it's permissible for
the Perl code to create its own global Perl variables, data structures,
saved state, and the like, and all of that will be available to
Modified: doc/pod/install.pod
===================================================================
--- doc/pod/install.pod 2009-08-14 18:31:09 UTC (rev 8560)
+++ doc/pod/install.pod 2009-08-14 18:32:41 UTC (rev 8561)
@@ -459,7 +459,7 @@
./configure --with-perl
provided that you have the necessary version of Perl installed.
-(Compiling with an embedded Perl interpretor will allow you to use one of
+(Compiling with an embedded Perl interpreter will allow you to use one of
the available excellent spam filters if you so choose.)
If the configure program runs successfully, then you are ready to build
Modified: lib/perl.c
===================================================================
--- lib/perl.c 2009-08-14 18:31:09 UTC (rev 8560)
+++ lib/perl.c 2009-08-14 18:32:41 UTC (rev 8561)
@@ -46,7 +46,7 @@
/* The filter sub called (filter_art or filter_post). */
CV *perl_filter_cv;
-/* The embedded Perl interpretor. */
+/* The embedded Perl interpreter. */
static PerlInterpreter *PerlCode = NULL;
Modified: m4/perl.m4
===================================================================
--- m4/perl.m4 2009-08-14 18:31:09 UTC (rev 8560)
+++ m4/perl.m4 2009-08-14 18:32:41 UTC (rev 8561)
@@ -30,7 +30,7 @@
dnl that we have the right version and then set PERL_CPPFLAGS and PERL_LIBS as
dnl appropriate for embedded Perl.
AC_DEFUN([INN_ARG_PERL],
-[AC_ARG_VAR([PERL], [Location of Perl interpretor])
+[AC_ARG_VAR([PERL], [Location of Perl interpreter])
AC_ARG_WITH([perl],
[AS_HELP_STRING([--with-perl], [Embedded Perl script support [no]])],
[case $withval in
Modified: m4/python.m4
===================================================================
--- m4/python.m4 2009-08-14 18:31:09 UTC (rev 8560)
+++ m4/python.m4 2009-08-14 18:32:41 UTC (rev 8561)
@@ -6,7 +6,7 @@
dnl requested.
AC_DEFUN([INN_ARG_PYTHON],
-[AC_ARG_VAR([PYTHON], [Location of Python interpretor])
+[AC_ARG_VAR([PYTHON], [Location of Python interpreter])
AC_ARG_WITH([python],
[AS_HELP_STRING([--with-python], [Embedded Python module support [no]])],
[case $withval in
Modified: support/fixscript.in
===================================================================
--- support/fixscript.in 2009-08-14 18:31:09 UTC (rev 8560)
+++ support/fixscript.in 2009-08-14 18:32:41 UTC (rev 8561)
@@ -2,10 +2,10 @@
## $Id$
##
-## Fix interpretor paths and INN variable load paths.
+## Fix interpreter paths and INN variable load paths.
##
## Scripts shipped with INN always have the invocation path for the
-## interpretor on the first line and the command to load INN variable
+## interpreter on the first line and the command to load INN variable
## settings into the script on the second line. For example, for a Bourne
## shell script:
##
@@ -14,9 +14,9 @@
##
## This script takes as input such a script and outputs the same script
## with the first two lines replaced to have the correct path to the
-## interpretor and to the INN variable library, as determined by configure.
+## interpreter and to the INN variable library, as determined by configure.
##
-## If the script is invoked with the -i flag, only fix the interpretor
+## If the script is invoked with the -i flag, only fix the interpreter
## path and don't modify the second line of the file to include the
## appropriate innshellvars.
@@ -56,18 +56,18 @@
exit 1
fi
-interpretor=`head -n 1 "$input"`
-case "$interpretor" in
+interpreter=`head -n 1 "$input"`
+case "$interpreter" in
*/sh|*SH*)
path="@SHELL@"
lib=". $libdir/innshellvars"
;;
*/perl*|*PERL*)
- path=`echo "$interpretor" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"`
+ path=`echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"`
lib="use lib '@LIBPERLDIR@'; use INN::Config;"
;;
*)
- echo "Unknown interpretor $interpretor" >&2
+ echo "Unknown interpreter $interpreter" >&2
exit 1
;;
esac
More information about the inn-committers
mailing list