Skip to content

Commit

Permalink
periodic checkin
Browse files Browse the repository at this point in the history
  • Loading branch information
gtrubetskoy committed Oct 18, 2000
1 parent 556acf8 commit d9e3ff7
Show file tree
Hide file tree
Showing 10 changed files with 213 additions and 299 deletions.
95 changes: 90 additions & 5 deletions configure
View file
Expand Up @@ -1136,7 +1136,7 @@ else
echo "$ac_t""no" 1>&6
fi

if test -z "$APXS"; then
if test -n "$APXS"; then
echo "$ac_t""found $APXS, we'll use this. Use --with-apxs to specify another." 1>&6
fi
fi
Expand Down Expand Up @@ -1384,6 +1384,86 @@ fi
INCLUDES="${INCLUDES} ${AP_INCLUDES} ${PY_INCLUDES}"
echo "$ac_t""$PY_INCLUDES" 1>&6



echo $ac_n "checking for mkdep""... $ac_c" 1>&6
echo "configure:1391: checking for mkdep" >&5
# Extract the first word of ""mkdep"", so it can be a program name with args.
set dummy "mkdep"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1395: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MKDEP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$MKDEP" in
/*)
ac_cv_path_MKDEP="$MKDEP" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_MKDEP="$MKDEP" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_MKDEP="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
;;
esac
fi
MKDEP="$ac_cv_path_MKDEP"
if test -n "$MKDEP"; then
echo "$ac_t""$MKDEP" 1>&6
else
echo "$ac_t""no" 1>&6
fi


if test -z "${MKDEP}"; then
echo $ac_n "checking for makedepend""... $ac_c" 1>&6
echo "configure:1430: checking for makedepend" >&5
# Extract the first word of ""makedepend"", so it can be a program name with args.
set dummy "makedepend"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1434: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MKDEP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$MKDEP" in
/*)
ac_cv_path_MKDEP="$MKDEP" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_MKDEP="$MKDEP" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_MKDEP="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
;;
esac
fi
MKDEP="$ac_cv_path_MKDEP"
if test -n "$MKDEP"; then
echo "$ac_t""$MKDEP" 1>&6
else
echo "$ac_t""no" 1>&6
fi

fi

trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
Expand Down Expand Up @@ -1545,6 +1625,7 @@ s%@STATIC@%$STATIC%g
s%@PYTHON_BIN@%$PYTHON_BIN%g
s%@PY_STD_LIB@%$PY_STD_LIB%g
s%@INCLUDES@%$INCLUDES%g
s%@MKDEP@%$MKDEP%g
CEOF
EOF
Expand Down Expand Up @@ -1658,7 +1739,11 @@ rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
# make dependencies
echo "analyzing dependencies"
cd src
make depend
if test -n "$MKDEP"; then
# make dependencies
echo "analyzing dependencies"
cd src
make depend
fi
26 changes: 20 additions & 6 deletions configure.in
View file
@@ -1,5 +1,5 @@
dnl Copyright 2000 Gregory Trubetskoy <grisha@ispol.com>
dnl $Id: configure.in,v 1.3 2000/10/16 20:58:30 gtrubetskoy Exp $
dnl $Id: configure.in,v 1.4 2000/10/18 20:01:28 gtrubetskoy Exp $

dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/mod_python.c)
Expand Down Expand Up @@ -64,7 +64,7 @@ fi
if test -z "$APXS"; then
AC_MSG_CHECKING(for apxs in your PATH)
AC_PATH_PROG(APXS, apxs)
if test -z "$APXS"; then
if test -n "$APXS"; then
AC_MSG_RESULT([found $APXS, we'll use this. Use --with-apxs to specify another.])
fi
fi
Expand Down Expand Up @@ -224,9 +224,23 @@ fi
INCLUDES="${INCLUDES} ${AP_INCLUDES} ${PY_INCLUDES}"
AC_MSG_RESULT($PY_INCLUDES)

AC_SUBST(MKDEP)

AC_MSG_CHECKING(for mkdep)
AC_PATH_PROG(MKDEP, "mkdep")

if test -z "${MKDEP}"; then
AC_MSG_CHECKING(for makedepend)
AC_PATH_PROG(MKDEP, "makedepend")
fi

AC_OUTPUT(Makefile src/Makefile src/libpython.module)

# make dependencies
echo "analyzing dependencies"
cd src
make depend
if test -n "$MKDEP"; then
# make dependencies
echo "analyzing dependencies"
cd src
make depend
fi


32 changes: 23 additions & 9 deletions doc/directives.html
View file
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">

<!-- $Id: directives.html,v 1.15 2000/10/03 03:24:39 gtrubetskoy Exp $ -->
<!-- $Id: directives.html,v 1.16 2000/10/18 20:01:29 gtrubetskoy Exp $ -->

<html>
<head>
Expand Down Expand Up @@ -447,7 +447,8 @@ <h2><a name="PythonImport">PythonImport</a></h2>
imported within the subinterpreter according with the directory name
specified by the &lt;Directory&gt; directive. For all other
subinterpreters, the module will not appear imported.

<p>
See also <a href="pythonapi.html#subinterpreters">Multiple Interpreters</a>.
<hr>

<h2><a name="PythonInterpreter">PythonInterpreter</a></h2>
Expand All @@ -462,11 +463,20 @@ <h2><a name="PythonInterpreter">PythonInterpreter</a></h2>

<p>
Forces the subinterpreter name to be <em>name</em>, instead of the
name assigned by mod_python. Mod_python names subinterpreters by using
full path of a directory thereby guaranteeing uniqueness per directory. By using
this directive, scripts located in different directories and that would
name assigned by mod_python. By default, mod_python names subinterpreters by using
the server name thereby guaranteeing that scripts in separate virtual
servers execute in seaparate intepreters and cannot share data. By using
this directive, scripts that would
by default be executed in different
subinterpreters, can be forced to execute in the same subinterpreter.
<p>
&quot;global_interpeter&quot; is a special name reserved for the <em>
global interpreter</em>. If you like not to have subinterpreters at all
and have all code execute in the global interpreter, put <pre>
PythonInterpreter &quot;global_interpreter&quot;</pre>
in your main configuration file.
<p>
See also <a href="pythonapi.html#subinterpreters">Multiple Interpreters</a>.

<hr>

Expand All @@ -484,7 +494,7 @@ <h2><a name="PythonInterpPerDirectory">PythonInterpPerDirectory</a></h2>

<p>
Instructs mod_python to name subinterpreters using the directory of
the file in the request (<code>request_rec->filename</code>) rather
the file in the request (<code>req.filename</code>) rather
than the the server name.


Expand All @@ -499,7 +509,7 @@ <h2><a name="PythonInterpPerDirectory">PythonInterpPerDirectory</a></h2>
<code>/directory/subdirectory</code> doesn't have an .htacess. By
default, scripts in <code>/directory</code> and
<code>/directory/subdirectory</code> would execute in the same
interpreter assuming both directories are in the same virtual server.
interpreter assuming both directories are accessed via the same virtual server.
With PythonInterpPerDirectory, there would be two different interpreters,
one for each <em>directory</em>.
<p>
Expand All @@ -509,6 +519,8 @@ <h2><a name="PythonInterpPerDirectory">PythonInterpPerDirectory</a></h2>
those phases and with PythonInterpPerDirectory on, all python code gets executed
in the global intepreter. This may not be exactly what you want, but
unfortunately there is no way around this.
<p>
See also <a href="pythonapi.html#subinterpreters">Multiple Interpreters</a>.
<hr>

<h2><a name="PythonInterpPerDirective">PythonInterpPerDirective</a></h2>
Expand Down Expand Up @@ -538,6 +550,8 @@ <h2><a name="PythonInterpPerDirective">PythonInterpPerDirective</a></h2>
interpreter assuming both directories are in the same virtual server.
With PythonInterpPerDirective, there would be two different interpreters,
one for each <em>directive</em>.
<p>
See also <a href="pythonapi.html#subinterpreters">Multiple Interpreters</a>.
<hr>

<h2><a name="PythonNoReload">PythonNoReload</a></h2>
Expand Down Expand Up @@ -621,7 +635,7 @@ <h2><a name="PythonPath">PythonPath</a></h2>
Mod_python tries to minimize the number of evals associated with the
<code>PythonPath</code> directive because evals are slow and can
negatively impact performance, especially when the directive is
specified in an .htaccess file which gets parse at every
specified in an .htaccess file which gets parsed at every
hit. Mod_python will remember the arguments to the PythonPath
directive in the un-evaled form, and before evaling the value it will
compare it to the remembered value. If the value is the same, no
Expand All @@ -636,7 +650,7 @@ <h2><a name="PythonPath">PythonPath</a></h2>
<hr>
<!-- Created: Sat May 6 21:05:39 EDT 2000 -->
<!-- hhmts start -->
Last modified: Mon Oct 2 23:05:55 EDT 2000
Last modified: Wed Oct 18 11:47:44 EDT 2000
<!-- hhmts end -->
</body>
</html>

0 comments on commit d9e3ff7

Please sign in to comment.