cvs: docweb / build-ops.in build-ops.php.in configure configure.in

sean Tue Jan 25 00:41:42 2005 EDT Modified files: /docweb build-ops.in build-ops.php.in configure configure.in Log: LIVEDOCS mirror configure support http://cvs.php.net/diff.php/docweb/build-ops.in?r1=1.3&r2=1.4&ty=u Index: docweb/build-ops.in diff -u docweb/build-ops.in:1.3 docweb/build-ops.in:1.4 --- docweb/build-ops.in:1.3 Mon Nov 29 10:30:58 2004 +++ docweb/build-ops.in Tue Jan 25 00:41:41 2005 @@ -10,4 +10,5 @@ FILESDIR=@FILESDIR@ WWWUSER=@WWWUSER@ WWWGROUP=@WWWGROUP@ +LIVEDOCS=@LIVEDOCS@ http://cvs.php.net/diff.php/docweb/build-ops.php.in?r1=1.3&r2=1.4&ty=u Index: docweb/build-ops.php.in diff -u docweb/build-ops.php.in:1.3 docweb/build-ops.php.in:1.4 --- docweb/build-ops.php.in:1.3 Mon Nov 29 10:30:58 2004 +++ docweb/build-ops.php.in Tue Jan 25 00:41:41 2005 @@ -1,5 +1,5 @@ <?php -// $Id: build-ops.php.in,v 1.3 2004/11/29 15:30:58 sean Exp $ +// $Id: build-ops.php.in,v 1.4 2005/01/25 05:41:41 sean Exp $ // autoconf-generated file for docweb define('PHP_BINARY', '@PHP@'); @@ -12,5 +12,6 @@ define('FILES_DIR', '@FILESDIR@'); define('WWW_USER', '@WWWUSER@'); define('WWW_GROUP', '@WWWGROUP@'); +define('LIVEDOCS', '@LIVEDOCS@'); ?> http://cvs.php.net/diff.php/docweb/configure?r1=1.4&r2=1.5&ty=u Index: docweb/configure diff -u docweb/configure:1.4 docweb/configure:1.5 --- docweb/configure:1.4 Sun Jan 16 06:49:19 2005 +++ docweb/configure Tue Jan 25 00:41:41 2005 @@ -29,6 +29,8 @@ --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 $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 @@ 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 @@ # 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 @@ 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 @@ # 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 @@ 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 @@ + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1008,6 +1020,7 @@ s%@FILESDIR@%$FILESDIR%g s%@WWWUSER@%$WWWUSER%g s%@WWWGROUP@%$WWWGROUP%g +s%@LIVEDOCS@%$LIVEDOCS%g CEOF EOF http://cvs.php.net/diff.php/docweb/configure.in?r1=1.6&r2=1.7&ty=u Index: docweb/configure.in diff -u docweb/configure.in:1.6 docweb/configure.in:1.7 --- docweb/configure.in:1.6 Sun Jan 16 06:49:19 2005 +++ docweb/configure.in Tue Jan 25 00:41:41 2005 @@ -1,5 +1,5 @@ ## A configure script -## $Id: configure.in,v 1.6 2005/01/16 11:49:19 nlopess Exp $ +## $Id: configure.in,v 1.7 2005/01/25 05:41:41 sean Exp $ AC_PREREQ(2.13) AC_INIT() @@ -82,6 +82,10 @@ [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(FILESDIR) AC_SUBST(WWWUSER) AC_SUBST(WWWGROUP) +AC_SUBST(LIVEDOCS) AC_OUTPUT(build-ops.php build-ops)