 |
 |
 |
 |
|
|
Date: 06/01/99
- Next message: Brian Havard: "[PHP-DEV] Getting changes committed"
- Previous message: Frank M. Kromann: "Re: [PHP-DEV] 3.0.9 rolled, please test for showstoppers"
- Next in thread: jim: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Tuesday June 1, 1999 @ 19:55
Author: jim
Update of /repository/php3
In directory php:/tmp/cvs-serv13567
Modified Files:
configure.in
Log Message:
Look for SGML stuff in a few more places.
Since --with-pcre-regex is the default, make --help detail --without-pcre-regex
Fix --with-shared-apache if PCRE or dbase are enabled (I hope -- needs testing).
Fix --with-apache when PCRE is enabled (which is by default, so it better work).
Index: php3/configure.in
diff -u php3/configure.in:1.386 php3/configure.in:1.387
--- php3/configure.in:1.386 Tue Jun 1 18:04:23 1999
+++ php3/configure.in Tue Jun 1 19:55:24 1999
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.386 1999/06/01 22:04:23 jah Exp $
+dnl $Id: configure.in,v 1.387 1999/06/01 23:55:24 jim Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -218,8 +218,15 @@
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; do
+ /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"
@@ -301,6 +308,15 @@
withval=/usr/local/etc/httpd
fi
if test "$withval" != "no"; then
+# figure out extra library nonsense
+ if test "$with_dbase" = "yes"; then
+ extra_copy="$extra_copy dbase/libdbf.a"
+ extra_l="$extra_l -ldbf"
+ fi
+ if test "$with_pcre_regex" != "no"; then
+ extra_copy="$extra_copy pcrelib/libpcre.a"
+ extra_l="$extra_l -lpcre"
+ fi
if test -f $withval/src/include/httpd.h; then
APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
APACHE_TARGET=$withval/src/modules/php3
@@ -310,9 +326,9 @@
CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2`
LDFLAGS_SHLIB=`perl -V:lddlflags | cut -d\' -f2`
LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
- PHP_LIBS=
+ PHP_LIBS=$extra_l
BINNAME=libmodphp3-so.a
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+ INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $extra_copy $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - Shared Apache 1.3.x)
STRONGHOLD=
@@ -355,18 +371,22 @@
withval=/usr/local/etc/httpd
fi
if test "$withval" != "no"; then
+# figure out extra library nonsense
+ if test "$with_dbase" = "yes"; then
+ extra_copy="$extra_copy dbase/libdbf.a"
+ extra_l="$extra_l -ldbf"
+ fi
+ if test "$with_pcre_regex" != "no"; then
+ extra_copy="$extra_copy pcrelib/libpcre.a"
+ extra_l="$extra_l -lpcre"
+ fi
# For Apache 1.2.x
if test -f $withval/src/httpd.h; then
APACHE_INCLUDE=-I$withval/src
APACHE_TARGET=$withval/src
BINNAME=libphp3.a
- if test "$with_dbase" = "yes"; then
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module dbase/libdbf.a $APACHE_TARGET"
- PHP_LIBS="-L. -lphp3 -ldbf"
- else
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $APACHE_TARGET"
- PHP_LIBS="-L. -lphp3"
- fi
+ INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $extra_copy $APACHE_TARGET"
+ PHP_LIBS="-L. -lphp3 $extra_l"
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - Apache 1.2.x)
STRONGHOLD=
@@ -381,13 +401,8 @@
mkdir $APACHE_TARGET
fi
BINNAME=libmodphp3.a
- if test "$with_dbase" = "yes"; then
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module dbase/libdbf.a $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
- PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
- else
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
- PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
- fi
+ INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $extra_copy $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+ PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 $extra_l"
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - Apache 1.3.x)
STRONGHOLD=
@@ -412,13 +427,8 @@
mkdir $APACHE_TARGET
fi
BINNAME=libmodphp3.a
- if test "$with_dbase" = "yes"; then
- PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h dbase/libdbf.a $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir; cp libphp3.module $APACHE_TARGET"
- else
- PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir; cp libphp3.module $APACHE_TARGET"
- fi
+ PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 $extra_l"
+ INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h $extra_copy $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir; cp libphp3.module $APACHE_TARGET"
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - Apache 1.3.x)
STRONGHOLD=
@@ -440,13 +450,8 @@
APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
APACHE_TARGET=$withval/apache
BINNAME=libmodphp3.a
- if test "$with_dbase" = "yes"; then
- PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module dbase/libdbf.a $APACHE_TARGET"
- else
- PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
- INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $APACHE_TARGET"
- fi
+ PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 $extra_l"
+ INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $extra_copy $APACHE_TARGET"
STRONGHOLD=-DSTRONGHOLD=1
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - StrongHold)
@@ -2610,7 +2615,7 @@
AC_MSG_CHECKING(whether to include PCRE support)
AC_ARG_WITH(pcre-regex,
-[ --with-pcre-regex Include Perl Compatible Regular Expressions support],[
+[ --without-pcre-regex Don't include Perl Compatible Regular Expressions support],[
if test "$withval" = "yes"; then
PCRE_LIB="pcrelib/libpcre.a"
PCRE_LIBS="-Lpcrelib -lpcre"
-- PHP Development Mailing List (http://www.php.net/) To unsubscribe, e-mail: php-dev-unsubscribe <email protected> For additional commands, e-mail: php-dev-help <email protected> To contact the list administrators, e-mail: php-list-admin <email protected>
- Next message: Brian Havard: "[PHP-DEV] Getting changes committed"
- Previous message: Frank M. Kromann: "Re: [PHP-DEV] 3.0.9 rolled, please test for showstoppers"
- Next in thread: jim: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]