LIVEDOCS mirror configure support

This commit is contained in:
Sean Coates
2005-01-25 05:41:41 +00:00
parent 0039d89bbb
commit ac2fbece6a
4 changed files with 27 additions and 7 deletions

View File

@ -10,4 +10,5 @@ SQLITEDIR=@SQLITEDIR@
FILESDIR=@FILESDIR@
WWWUSER=@WWWUSER@
WWWGROUP=@WWWGROUP@
LIVEDOCS=@LIVEDOCS@

View File

@ -12,5 +12,6 @@ define('SQLITE_DIR', '@SQLITEDIR@');
define('FILES_DIR', '@FILESDIR@');
define('WWW_USER', '@WWWUSER@');
define('WWW_GROUP', '@WWWGROUP@');
define('LIVEDOCS', '@LIVEDOCS@');
?>

27
configure vendored
View File

@ -29,6 +29,8 @@ ac_help="$ac_help
--with-www-user[=USER] Web Server user [default=`whoami`]"
ac_help="$ac_help
--with-www-group[=GROUP] Web Server group [default=`groups | cut -d" " -f1`]"
ac_help="$ac_help
--with-livedocs[=URL] URL to livedocs mirror [default=http://docs.php.net/]"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@ -569,7 +571,7 @@ if test "${with_php+set}" = set; then
if test $withval != "yes"; then
echo $ac_n "checking for php""... $ac_c" 1>&6
echo "configure:573: checking for php" >&5
echo "configure:575: checking for php" >&5
if test -x $withval; then
PHP=$withval
echo "$ac_t""$PHP" 1>&6
@ -581,14 +583,14 @@ echo "configure:573: checking for php" >&5
else
if test -e ../phpdoc-tools/php.bat ; then
echo $ac_n "checking for php""... $ac_c" 1>&6
echo "configure:585: checking for php" >&5
echo "configure:587: checking for php" >&5
PHP=../phpdoc-tools/php.bat
echo "$ac_t""$PHP" 1>&6
else
# Extract the first word of ""php"", so it can be a program name with args.
set dummy "php"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:592: checking for $ac_word" >&5
echo "configure:594: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PHP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -625,7 +627,7 @@ fi
# Extract the first word of ""php4"", so it can be a program name with args.
set dummy "php4"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:629: checking for $ac_word" >&5
echo "configure:631: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PHP4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -667,14 +669,14 @@ else
if test -e ../phpdoc-tools/php.bat ; then
echo $ac_n "checking for php""... $ac_c" 1>&6
echo "configure:671: checking for php" >&5
echo "configure:673: checking for php" >&5
PHP=../phpdoc-tools/php.bat
echo "$ac_t""$PHP" 1>&6
else
# Extract the first word of ""php"", so it can be a program name with args.
set dummy "php"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:678: checking for $ac_word" >&5
echo "configure:680: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PHP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -711,7 +713,7 @@ fi
# Extract the first word of ""php4"", so it can be a program name with args.
set dummy "php4"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:715: checking for $ac_word" >&5
echo "configure:717: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PHP4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -828,6 +830,15 @@ else
fi
# Check whether --with-livedocs or --without-livedocs was given.
if test "${with_livedocs+set}" = set; then
withval="$with_livedocs"
LIVEDOCS="$withval"
else
LIVEDOCS="http://docs.php.net/"
fi
DOCWEB=`pwd`
if test `uname|grep CYGWIN` ; then
@ -853,6 +864,7 @@ fi
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@ -1008,6 +1020,7 @@ s%@SQLITEDIR@%$SQLITEDIR%g
s%@FILESDIR@%$FILESDIR%g
s%@WWWUSER@%$WWWUSER%g
s%@WWWGROUP@%$WWWGROUP%g
s%@LIVEDOCS@%$LIVEDOCS%g
CEOF
EOF

View File

@ -82,6 +82,10 @@ AC_ARG_WITH(www-group,[ --with-www-group[=GROUP] Web Server group [default=`
[WWWGROUP="$withval"],
[WWWGROUP="`groups | cut -d" " -f1`"])
AC_ARG_WITH(livedocs,[ --with-livedocs[=URL] URL to livedocs mirror [default=http://docs.php.net/]],
[LIVEDOCS="$withval"],
[LIVEDOCS="http://docs.php.net/"])
DOCWEB=`pwd`
if test `uname|grep CYGWIN` ; then
@ -106,6 +110,7 @@ AC_SUBST(SQLITEDIR)
AC_SUBST(FILESDIR)
AC_SUBST(WWWUSER)
AC_SUBST(WWWGROUP)
AC_SUBST(LIVEDOCS)
AC_OUTPUT(build-ops.php build-ops)