CVS update: php3

Date: Friday June 18, 1999 @ 20:56 Author: jim Update of /repository/php3 In directory php:/tmp/cvs-serv13839 Modified Files: configure.in Log Message: Ladies and gentleman, the documentation has left the building. Also cleaned up some of the output of configure.in. Index: php3/configure.in diff -u php3/configure.in:1.396 php3/configure.in:1.397 --- php3/configure.in:1.396 Wed Jun 16 15:04:19 1999 +++ php3/configure.in Fri Jun 18 20:56:02 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.396 1999/06/16 19:04:19 steinm Exp $ +dnl $Id: configure.in,v 1.397 1999/06/19 00:56:02 jim Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -216,32 +216,6 @@ AC_BROKEN_SPRINTF AC_REPLACE_FUNCS(getopt) -AC_MSG_CHECKING(for docbook.dsl) -for dir in /usr/lib/dsssl/stylesheets/docbook \ - /usr/lib/dsssl/stylesheets/nwalsh-modular \ - /usr/lib/dsssl/stylesheets/docbook \ - /usr/lib/sgml/stylesheets/nwalsh-modular \ - /usr/lib/sgml/docbook\ - /usr/local/lib/dsssl/stylesheets/docbook \ - /usr/local/lib/dsssl/stylesheets/nwalsh-modular \ - /usr/local/lib/sgml/stylesheets/docbook \ - /usr/local/lib/sgml/stylesheets/nwalsh-modular \ - /usr/local/lib/sgml/docbook ; do - if test -d "$dir"; then - DOCBOOK_HTML="$dir/html/docbook.dsl" - DOCBOOK_PRINT="$dir/print/docbook.dsl" - AC_MSG_RESULT(in $dir) - break - fi -done -if test -z "$DOCBOOK_HTML"; then - DOCBOOK_HTML="/usr/lib/sgml/stylesheets/nwalsh-modular/html/docbook.dsl" - DOCBOOK_PRINT="/usr/lib/sgml/stylesheets/nwalsh-modular/print/docbook.dsl" - AC_MSG_RESULT(defaulting) -fi -AC_SUBST(DOCBOOK_HTML) -AC_SUBST(DOCBOOK_PRINT) - dnl AIX keeps in_addr_t in /usr/include/netinet/in.h dnl AC_MSG_CHECKING(for in_addr_t) AC_CACHE_VAL(ac_cv_type_$1, @@ -1849,10 +1823,10 @@ AC_MSG_RESULT(no) ;; yes) AC_MSG_RESULT(yes) - AC_MSG_WARN(!!!!! Attention for pdflib 0.6 !!!!!) - AC_MSG_WARN(In order to ensure proper working of the pdf module, you should) + AC_MSG_WARN(!!!!! Note for pdflib 0.6 !!!!!) + AC_MSG_WARN(In order to ensure the pdf module works correctly, you must) AC_MSG_WARN(modify the pdflib distribution. Take out line 190 in) - AC_MSG_WARN(file p_basic.c which closes the pdf file. Read also the php3) + AC_MSG_WARN(file p_basic.c which closes the pdf file. Read the php3) AC_MSG_WARN(documentation for more information.) AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-lpdf"], [AC_MSG_ERROR(pdflib module requires at least pdflib 0.6)]) @@ -1862,10 +1836,10 @@ test -d $withval/include && PDFLIB_INCLUDE="-I$withval/include" if test -f $withval/include/pdf.h ; then AC_MSG_RESULT(yes) - AC_MSG_WARN(!!!!! Attention for pdflib 0.6 !!!!!) - AC_MSG_WARN(In order to ensure proper working of the pdf module, you should) + AC_MSG_WARN(!!!!! Note for pdflib 0.6 !!!!!) + AC_MSG_WARN(In order to ensure the pdf module works correctly, you must) AC_MSG_WARN(modify the pdflib distribution. Take out line 190 in) - AC_MSG_WARN(file p_basic.c which closes the pdf file. Read also) + AC_MSG_WARN(file p_basic.c which closes the pdf file. Read) AC_MSG_WARN(the php3 documentation for more information.) old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" @@ -2614,7 +2588,7 @@ fi done if test "$MCRYPT_DIR" = ""; then - AC_MSG_ERROR(Please install mcrypt.h and libmcrypt.a accordingly to the documentation - I cannot find mcrypt.h) + AC_MSG_ERROR(Please install mcrypt.h and libmcrypt.a as explained in the documentation - I cannot find mcrypt.h) fi INCLUDES="$INCLUDES -I$MCRYPT_DIR/include" EXTRA_LIBS="$EXTRA_LIBS -L$MCRYPT_DIR/lib -lmcrypt" @@ -2678,9 +2652,9 @@ AC_SUBST(PCRE_LIB) AC_SUBST(PCRE_LIBS) -AC_MSG_CHECKING(whether to include Posix support) +AC_MSG_CHECKING(whether to include POSIX support) AC_ARG_WITH(posix, -[ --without-posix Don't include Posix functions],[ +[ --without-posix Don't include POSIX functions],[ if test "$withval" = "yes"; then AC_DEFINE(HAVE_POSIX, 1) AC_MSG_RESULT(yes) @@ -2747,10 +2721,9 @@ PHP_OS=uname AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS") -AC_OUTPUT(Makefile build-defs.h stamp-h libphp3.module doc/Makefile - doc/version.ent doc/checkdoc doc/html.dsl doc/print.dsl doc/phpweb.dsl +AC_OUTPUT(Makefile build-defs.h stamp-h libphp3.module extra/gd/bdf2gdfont regex/Makefile pcrelib/Makefile dbase/Makefile, [ - chmod +x doc/checkdoc extra/gd/bdf2gdfont + chmod +x extra/gd/bdf2gdfont ], [ dnl Warn about CGI version with no extra security options.