cvs: /php4 acinclude.m4 configure.in.in /php4/ext/bcmath config.m4 /php4/ext/gettext config.m4 /php4/ext/icap config.m4 /php4/ext/mcal config.m4
/php4/ext/mhash config.m4 /php4/ext/mysql config.m4 /php4/ext/oci8 config.m4 /php4/ext/yp config.m4

ssb Mon Sep 13 13:17:52 1999 EDT Modified files: /php4 acinclude.m4 configure.in.in /php4/ext/bcmath config.m4 /php4/ext/gettext config.m4 /php4/ext/icap config.m4 /php4/ext/mcal config.m4 /php4/ext/mhash config.m4 /php4/ext/mysql config.m4 /php4/ext/oci8 config.m4 /php4/ext/yp config.m4 Log: Added PHP_WITH_SHARED for checking "shared,*" prefix when configuring extensions. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.26 php4/acinclude.m4:1.27 --- php4/acinclude.m4:1.26 Sun Sep 12 08:20:59 1999 +++ php4/acinclude.m4 Mon Sep 13 13:17:50 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.26 1999/09/12 12:20:59 sas Exp $ +dnl $Id: acinclude.m4,v 1.27 1999/09/13 17:17:50 ssb Exp $ dnl dnl This file contains local autoconf functions. @@ -189,4 +189,25 @@ else AC_MSG_RESULT(no) fi +]) + +dnl +dnl Checks whether $withval is "shared" or starts with "shared,XXX" +dnl and sets $shared to "yes" or "no", and removes "shared,?" stuff +dnl from $withval. +dnl +AC_DEFUN(PHP_WITH_SHARED,[ + case $withval in + shared) + shared=yes + withval=yes + ;; + shared,*) + shared=yes + withval=echo $withval | sed -e 's/^shared,//' + ;; + *) + shared=no + ;; + esac ]) Index: php4/configure.in.in diff -u php4/configure.in.in:1.75 php4/configure.in.in:1.76 --- php4/configure.in.in:1.75 Sat Sep 11 14:15:39 1999 +++ php4/configure.in.in Mon Sep 13 13:17:50 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.75 1999/09/11 18:15:39 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.76 1999/09/13 17:17:50 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -77,7 +77,7 @@ fi dnl Checks for programs. -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL AC_PROG_YACC if test "$YACC" != "bison -y"; then AC_MSG_WARN(You will need bison if you want to regenerate the PHP parsers.) @@ -863,7 +863,7 @@ DMALLOC_RESULT=no AC_MSG_CHECKING(whether to enable dmalloc) AC_ARG_ENABLE(dmalloc, -[ --enable-dmalloc Enable dmalloc], +[ --enable-dmalloc Enable dmalloc], [ if test "$enableval" = "yes" ; then AC_DEFINE(HAVE_DMALLOC, 1) Index: php4/ext/bcmath/config.m4 diff -u php4/ext/bcmath/config.m4:1.2 php4/ext/bcmath/config.m4:1.3 --- php4/ext/bcmath/config.m4:1.2 Sat Jul 17 06:14:04 1999 +++ php4/ext/bcmath/config.m4 Mon Sep 13 13:17:50 1999 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.2 1999/07/17 10:14:04 zeev Exp $ +dnl $Id: config.m4,v 1.3 1999/09/13 17:17:50 ssb Exp $ AC_MSG_CHECKING(whether to enable bc style precision math functions) AC_ARG_ENABLE(bcmath, -[ --enable-bcmath Compile with bc style precision math functions. - Read README-BCMATH for instructions on how to - get this module installed. ], +[ --enable-bcmath Compile with bc style precision math functions. + Read README-BCMATH for instructions on how to + get this module installed. ], [ if test "$enableval" = "yes"; then AC_DEFINE(WITH_BCMATH, 1) Index: php4/ext/gettext/config.m4 diff -u php4/ext/gettext/config.m4:1.1 php4/ext/gettext/config.m4:1.2 --- php4/ext/gettext/config.m4:1.1 Wed Apr 21 13:26:16 1999 +++ php4/ext/gettext/config.m4 Mon Sep 13 13:17:50 1999 @@ -1,11 +1,11 @@ -dnl $Id: config.m4,v 1.1 1999/04/21 17:26:16 sas Exp $ +dnl $Id: config.m4,v 1.2 1999/09/13 17:17:50 ssb Exp $ dnl config.m4 for extension gettext dnl don't forget to call PHP_EXTENSION(gettext) AC_MSG_CHECKING(whether to include GNU gettext support) AC_ARG_WITH(gettext, [ --with-gettext[=DIR] Include GNU gettext support. DIR is the gettext - install directory, defaults to /usr/local], + install directory, defaults to /usr/local], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then Index: php4/ext/icap/config.m4 diff -u php4/ext/icap/config.m4:1.3 php4/ext/icap/config.m4:1.4 --- php4/ext/icap/config.m4:1.3 Tue Aug 17 10:31:39 1999 +++ php4/ext/icap/config.m4 Mon Sep 13 13:17:50 1999 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.3 1999/08/17 14:31:39 musone Exp $ +dnl $Id: config.m4,v 1.4 1999/09/13 17:17:50 ssb Exp $ AC_MSG_CHECKING(for ICAP support) AC_ARG_WITH(icap, -[ --with-icap[=DIR] Include ICAP support.], +[ --with-icap[=DIR] Include ICAP support.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then Index: php4/ext/mcal/config.m4 diff -u php4/ext/mcal/config.m4:1.1 php4/ext/mcal/config.m4:1.2 --- php4/ext/mcal/config.m4:1.1 Wed Sep 1 16:30:26 1999 +++ php4/ext/mcal/config.m4 Mon Sep 13 13:17:50 1999 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.1 1999/09/01 20:30:26 musone Exp $ +dnl $Id: config.m4,v 1.2 1999/09/13 17:17:50 ssb Exp $ AC_MSG_CHECKING(for MCAL support) AC_ARG_WITH(mcal, -[ --with-mcal[=DIR] Include MCAL support.], +[ --with-mcal[=DIR] Include MCAL support.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then Index: php4/ext/mhash/config.m4 diff -u php4/ext/mhash/config.m4:1.3 php4/ext/mhash/config.m4:1.4 --- php4/ext/mhash/config.m4:1.3 Sun Jun 20 14:52:41 1999 +++ php4/ext/mhash/config.m4 Mon Sep 13 13:17:51 1999 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.3 1999/06/20 18:52:41 sas Exp $ +dnl $Id: config.m4,v 1.4 1999/09/13 17:17:51 ssb Exp $ dnl config.m4 for extension mhash dnl don't forget to call PHP_EXTENSION(mhash) AC_MSG_CHECKING(for mhash support) AC_ARG_WITH(mhash, -[ --with-mhash[=DIR] Include mhash support. DIR is the mhash +[ --with-mhash[=DIR] Include mhash support. DIR is the mhash install directory.], [ if test "$withval" != "no"; then Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.9 php4/ext/mysql/config.m4:1.10 --- php4/ext/mysql/config.m4:1.9 Fri Sep 3 13:13:53 1999 +++ php4/ext/mysql/config.m4 Mon Sep 13 13:17:51 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 1999/09/03 17:13:53 gorgo Exp $ +dnl $Id: config.m4,v 1.10 1999/09/13 17:17:51 ssb Exp $ AC_MSG_CHECKING(for MySQL support) AC_ARG_WITH(mysql, @@ -8,82 +8,70 @@ Set DIR to "shared" to build as a dl, or "shared,DIR" to build as a dl and still specify DIR.], [ - case $withval in - shared) - shared=yes - withval=yes - ;; - shared,*) - shared=yes - withval=echo $withval | sed -e 's/^shared,//' - ;; - *) - shared=no - ;; - esac - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - if test -f /usr/include/mysql/mysql.h; then - MYSQL_INCDIR=/usr/include/mysql - if test -d /usr/lib/mysql; then - MYSQL_LIBDIR=/usr/lib/mysql - else - MYSQL_LIBDIR=/usr/lib - fi - elif test -f /usr/include/mysql.h; then - MYSQL_INCDIR=/usr/include - MYSQL_LIBDIR=/usr/lib - elif test -f /usr/local/include/mysql/mysql.h; then - MYSQL_INCDIR=/usr/local/include/mysql - MYSQL_LIBDIR=/usr/local/lib/mysql - elif test -f /usr/local/include/mysql.h; then - MYSQL_INCDIR=/usr/local/include - MYSQL_LIBDIR=/usr/local/lib - elif test -f /usr/local/mysql/include/mysql/mysql.h; then - MYSQL_INCDIR=/usr/local/mysql/include/mysql - MYSQL_LIBDIR=/usr/local/mysql/lib/mysql - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h) - fi - else - if test -f $withval/include/mysql/mysql.h; then - MYSQL_INCDIR=$withval/include/mysql - MYSQL_LIBDIR=$withval/lib/mysql - elif test -f $withval/include/mysql.h; then - MYSQL_INCDIR=$withval/include - MYSQL_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval) - fi - fi - MYSQL_INCLUDE=-I$MYSQL_INCDIR + PHP_WITH_SHARED + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + if test -f /usr/include/mysql/mysql.h; then + MYSQL_INCDIR=/usr/include/mysql + if test -d /usr/lib/mysql; then + MYSQL_LIBDIR=/usr/lib/mysql + else + MYSQL_LIBDIR=/usr/lib + fi + elif test -f /usr/include/mysql.h; then + MYSQL_INCDIR=/usr/include + MYSQL_LIBDIR=/usr/lib + elif test -f /usr/local/include/mysql/mysql.h; then + MYSQL_INCDIR=/usr/local/include/mysql + MYSQL_LIBDIR=/usr/local/lib/mysql + elif test -f /usr/local/include/mysql.h; then + MYSQL_INCDIR=/usr/local/include + MYSQL_LIBDIR=/usr/local/lib + elif test -f /usr/local/mysql/include/mysql/mysql.h; then + MYSQL_INCDIR=/usr/local/mysql/include/mysql + MYSQL_LIBDIR=/usr/local/mysql/lib/mysql + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h) + fi + else + if test -f $withval/include/mysql/mysql.h; then + MYSQL_INCDIR=$withval/include/mysql + MYSQL_LIBDIR=$withval/lib/mysql + elif test -f $withval/include/mysql.h; then + MYSQL_INCDIR=$withval/include + MYSQL_LIBDIR=$withval/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval) + fi + fi + MYSQL_INCLUDE=-I$MYSQL_INCDIR - AC_DEFINE(HAVE_MYSQL) - if test "$shared" = "yes"; then - AC_MSG_RESULT(yes (shared)) - MYSQL_LFLAGS="-L$MYSQL_LIBDIR" - MYSQL_SHARED="mysql.la" - else - AC_MSG_RESULT(yes (static)) - AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) - AC_ADD_INCLUDE($MYSQL_INCDIR) - MYSQL_STATIC="libphpext_mysql.a" - fi - PHP_EXTENSION(mysql, $shared) + AC_DEFINE(HAVE_MYSQL) + if test "$shared" = "yes"; then + AC_MSG_RESULT(yes (shared)) + MYSQL_LFLAGS="-L$MYSQL_LIBDIR" + MYSQL_SHARED="mysql.la" + else + AC_MSG_RESULT(yes (static)) + AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) + AC_ADD_INCLUDE($MYSQL_INCDIR) + MYSQL_STATIC="libphpext_mysql.a" + fi + PHP_EXTENSION(mysql, $shared) - dnl check for errmsg.h, which isn't installed by some versions of 3.21 - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE" - AC_CHECK_HEADERS(errmsg.h mysql.h) - CPPFLAGS="$old_CPPFLAGS" - else - AC_MSG_RESULT(no) - AC_DEFINE(HAVE_MYSQL, 0) - fi + dnl check for errmsg.h, which isn't installed by some versions of 3.21 + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE" + AC_CHECK_HEADERS(errmsg.h mysql.h) + CPPFLAGS="$old_CPPFLAGS" + else + AC_MSG_RESULT(no) + AC_DEFINE(HAVE_MYSQL, 0) + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) AC_SUBST(MYSQL_STATIC) AC_SUBST(MYSQL_SHARED) Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.4 php4/ext/oci8/config.m4:1.5 --- php4/ext/oci8/config.m4:1.4 Mon Sep 13 10:15:22 1999 +++ php4/ext/oci8/config.m4 Mon Sep 13 13:17:51 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/09/13 14:15:22 andrey Exp $ +dnl $Id: config.m4,v 1.5 1999/09/13 17:17:51 ssb Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -21,7 +21,7 @@ AC_MSG_CHECKING(for Oracle-OCI8 support) AC_ARG_WITH(oci8, -[ --with-oci8[=DIR] Include Oracle database support. DIR is Oracle's +[ --with-oci8[=DIR] Include Oracle database support. DIR is Oracle's home directory, defaults to \$ORACLE_HOME.], [ case "$withval" in Index: php4/ext/yp/config.m4 diff -u php4/ext/yp/config.m4:1.1 php4/ext/yp/config.m4:1.2 --- php4/ext/yp/config.m4:1.1 Fri May 21 04:29:49 1999 +++ php4/ext/yp/config.m4 Mon Sep 13 13:17:51 1999 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.1 1999/05/21 08:29:49 sas Exp $ +dnl $Id: config.m4,v 1.2 1999/09/13 17:17:51 ssb Exp $ dnl config.m4 for extension yp dnl don't forget to call PHP_EXTENSION(yp) AC_MSG_CHECKING(whether to include YP support) AC_ARG_WITH(yp, -[ --with-yp Include YP support], +[ --with-yp Include YP support], [ if test "$withval" = "yes"; then AC_MSG_RESULT(yes)