cvs: docweb / .cvsignore build-ops.in build-ops.php.in configure.in /include docweb_language.class.php init.inc.php

sean Tue Nov 23 17:53:40 2004 EDT Added files: /docweb build-ops.in build-ops.php.in configure.in Modified files: /docweb .cvsignore /docweb/include docweb_language.class.php init.inc.php Log: (minimal) autoconf for docweb # 48 hours, no objections http://cvs.php.net/diff.php/docweb/.cvsignore?r1=1.3&r2=1.4&ty=u Index: docweb/.cvsignore diff -u docweb/.cvsignore:1.3 docweb/.cvsignore:1.4 --- docweb/.cvsignore:1.3 Sun Sep 5 02:37:57 2004 +++ docweb/.cvsignore Tue Nov 23 17:53:40 2004 @@ -1,3 +1,14 @@ sqlite files cvs +build-ops +build-ops.php +config.cache +config.log +config.status +configure +config.nice +.*.swp +autom4te.cache +diff + http://cvs.php.net/diff.php/docweb/include/docweb_language.class.php?r1=1.3&r2=1.4&ty=u Index: docweb/include/docweb_language.class.php diff -u docweb/include/docweb_language.class.php:1.3 docweb/include/docweb_language.class.php:1.4 --- docweb/include/docweb_language.class.php:1.3 Sun Oct 31 00:49:38 2004 +++ docweb/include/docweb_language.class.php Tue Nov 23 17:53:40 2004 @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ | Authors: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: docweb_language.class.php,v 1.3 2004/10/31 04:49:38 sean Exp $ +$Id: docweb_language.class.php,v 1.4 2004/11/23 22:53:40 sean Exp $ */ /** @@ -86,7 +86,7 @@ } // use this file: - $entFile = PATH_ROOT . "/cvs/phpdoc-all/$lang/docweb/main.ent"; + $entFile = CVS_DIR ."/phpdoc-all/$lang/docweb/main.ent"; if (is_readable($entFile)) { // file is good; get its contents http://cvs.php.net/diff.php/docweb/include/init.inc.php?r1=1.4&r2=1.5&ty=u Index: docweb/include/init.inc.php diff -u docweb/include/init.inc.php:1.4 docweb/include/init.inc.php:1.5 --- docweb/include/init.inc.php:1.4 Sun Oct 31 00:49:38 2004 +++ docweb/include/init.inc.php Tue Nov 23 17:53:40 2004 @@ -18,15 +18,13 @@ | Gabor Hojtsy <goba@php.net> | | Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: init.inc.php,v 1.4 2004/10/31 04:49:38 sean Exp $ +$Id: init.inc.php,v 1.5 2004/11/23 22:53:40 sean Exp $ */ error_reporting(E_ALL); -// paths -define('PATH_ROOT', realpath(dirname(__FILE__) . '/../')); -define('SQLITE_DIR', PATH_ROOT . '/sqlite/'); -define('CVS_DIR', PATH_ROOT . '/cvs/'); +// get paths +require_once('../build-ops.php'); // project & language config require_once('lib_proj_lang.inc.php'); http://cvs.php.net/co.php/docweb/build-ops.in?r=1.1&p=1 Index: docweb/build-ops.in +++ docweb/build-ops.in #!/bin/sh CRONDIR=@CRONDIR@ CVSDIR=@CVSDIR@ DOCWEB=@DOCWEB@ SCRIPTSDIR=@SCRIPTSDIR@ SQLDIR=@SQLDIR@ SQLITEDIR=@SQLITEDIR@ http://cvs.php.net/co.php/docweb/build-ops.php.in?r=1.1&p=1 Index: docweb/build-ops.php.in +++ docweb/build-ops.php.in <?php // $Id: build-ops.php.in,v 1.1 2004/11/23 22:53:40 sean Exp $ // autoconf-generated file for docweb define('CRON_DIR', '@CRONDIR@'); define('CVS_DIR', '@CVSDIR@'); define('PATH_ROOT', '@DOCWEB@'); define('SCRIPTS_DIR', '@SCRIPTSDIR@'); define('SQL_DIR', '@SQLDIR@'); define('SQLITE_DIR', '@SQLITEDIR@'); ?> http://cvs.php.net/co.php/docweb/configure.in?r=1.1&p=1 Index: docweb/configure.in +++ docweb/configure.in ## A configure script ## $Id: configure.in,v 1.1 2004/11/23 22:53:40 sean Exp $ AC_PREREQ(2.13) AC_INIT() dnl "stolen" from livedocs: AC_ARG_WITH(php,[ --with-php[=PATH] Look for PHP executable needed for docweb scripts], [ if test $withval != "yes"; then AC_MSG_CHECKING([for php]) if test -x $withval; then PHP=$withval AC_MSG_RESULT($PHP) else PHP=no AC_MSG_RESULT(no) AC_MSG_ERROR([$withval: not an executable file]) fi else if test -e ../phpdoc-tools/php.bat ; then AC_MSG_CHECKING([for php]) PHP=../phpdoc-tools/php.bat AC_MSG_RESULT($PHP) else AC_PATH_PROG(PHP,"php",no) if test $PHP = "no"; then AC_PATH_PROG(PHP4,"php4",no) PHP=$PHP4 fi fi fi ],[ if test -e ../phpdoc-tools/php.bat ; then AC_MSG_CHECKING([for php]) PHP=../phpdoc-tools/php.bat AC_MSG_RESULT($PHP) else AC_PATH_PROG(PHP,"php",no) if test $PHP = "no"; then AC_PATH_PROG(PHP4,"php4",no) PHP=$PHP4 fi fi ] ) if test $PHP = "no"; then AC_MSG_ERROR([no PHP binary found]) fi AC_ARG_WITH(cron-dir,[ --with-cron-dir[=DIR] CRON scripts location [default=pwd/cron]], [CRONDIR="$withval"], [CRONDIR="pwd/cron"]) AC_ARG_WITH(cvs-dir,[ --with-cvs-dir[=DIR] CVS checkout location [default=pwd/cvs]], [CVSDIR="$withval"], [CVSDIR="pwd/cvs"]) AC_ARG_WITH(scripts-dir,[ --with-scripts-dir[=DIR] Scripts location [default=pwd/scripts]], [SCRIPTSDIR="$withval"], [SCRIPTSDIR="pwd/scripts"]) AC_ARG_WITH(sql-dir,[ --with-sql-dir[=DIR] SQL source location [default=pwd/sql]], [SQLDIR="$withval"], [SQLDIR="pwd/sql"]) AC_ARG_WITH(sqlite-dir,[ --with-sqlite-dir[=DIR] SQLite repository location [default=pwd/sqlite]], [SQLITEDIR="$withval"], [SQLITEDIR="pwd/sqlite"]) DOCWEB=pwd AC_SUBST(CRONDIR) AC_SUBST(CVSDIR) AC_SUBST(DOCWEB) AC_SUBST(SCRIPTSDIR) AC_SUBST(SQLDIR) AC_SUBST(SQLITEDIR) AC_OUTPUT(build-ops.php build-ops) dnl vim:et:sw=2:ts=2