cvs: /php4 acinclude.m4 /php4/ext ext_skel /php4/ext/dbase config.m4 /php4/ext/filepro config.m4 /php4/ext/ftp config.m4 /php4/ext/session config.m4
/php4/ext/wddx config.m4

sas Mon Mar 27 15:33:38 2000 EDT Modified files: /php4 acinclude.m4 /php4/ext ext_skel /php4/ext/dbase config.m4 /php4/ext/filepro config.m4 /php4/ext/ftp config.m4 /php4/ext/session config.m4 /php4/ext/wddx config.m4 Log: Welcome PHP_ARG_ENABLE and PHP_ARG_WITH. They are there to replace the common AC_MSG_CHECKING, AC_ARG_[ENABLE,WITH], AC_MSG_RESULT trio. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.68 php4/acinclude.m4:1.69 --- php4/acinclude.m4:1.68 Sat Mar 25 18:46:59 2000 +++ php4/acinclude.m4 Mon Mar 27 15:33:36 2000 @@ -1,6 +1,18 @@ -dnl $Id: acinclude.m4,v 1.68 2000/03/26 02:46:59 sas Exp $ +dnl $Id: acinclude.m4,v 1.69 2000/03/27 23:33:36 sas Exp $ dnl dnl This file contains local autoconf functions. + +AC_DEFUN(PHP_ARG_WITH,[ +AC_MSG_CHECKING($2) +AC_ARG_WITH($1,[$3],PHP_[]translit($1,a-z-,A-Z_)=[$]withval,PHP_[]translit($1,a-z-,A-Z_)=ifelse($4,,no,$4)) +AC_MSG_RESULT([$]PHP_[]translit($1,a-z-,A-Z_)) +]) + +AC_DEFUN(PHP_ARG_ENABLE,[ +AC_MSG_CHECKING($2) +AC_ARG_ENABLE($1,[$3],PHP_[]translit($1,a-z-,A-Z_)=[$]enableval,PHP_[]translit($1,a-z-,A-Z_)=ifelse($4,,no,$4)) +AC_MSG_RESULT([$]PHP_[]translit($1,a-z-,A-Z_)) +]) AC_DEFUN(PHP_MODULE_PTR,[ EXTRA_MODULE_PTRS="$EXTRA_MODULE_PTRS $1," Index: php4/ext/ext_skel diff -u php4/ext/ext_skel:1.14 php4/ext/ext_skel:1.15 --- php4/ext/ext_skel:1.14 Mon Mar 27 14:52:48 2000 +++ php4/ext/ext_skel Mon Mar 27 15:33:36 2000 @@ -44,27 +44,15 @@ dnl If your extension references something external, use with: -AC_MSG_CHECKING(whether to include $extname support) -AC_MSG_WITH($extname, +PHP_ARG_WITH($extname, for $extname support, dnl Make sure that the comment is aligned: -[ --with-$extname Include $extname support.],[ - PHP_$EXTNAME=\$withval -],[ - PHP_$EXTNAME=no -]) -AC_MSG_RESULT(\$PHP_$EXTNAME) +[ --with-$extname Include $extname support]) dnl Otherwise use enable: -AC_MSG_CHECKING(whether to enable $extname) -AC_MSG_ENABLE($extname, +PHP_ARG_ENABLE($extname, whether to enable $extname support, dnl Make sure that the comment is aligned: -[ --enable-$extname Include $extname support.],[ - PHP_$EXTNAME=\$enableval -],[ - PHP_$EXTNAME=no -]) -AC_MSG_RESULT(\$PHP_$EXTNAME) +[ --enable-$extname Enable $extname support]) if test "\$PHP_$EXTNAME" != "no"; then dnl Action.. Index: php4/ext/dbase/config.m4 diff -u php4/ext/dbase/config.m4:1.3 php4/ext/dbase/config.m4:1.4 --- php4/ext/dbase/config.m4:1.3 Wed Dec 29 20:07:21 1999 +++ php4/ext/dbase/config.m4 Mon Mar 27 15:33:36 2000 @@ -1,18 +1,13 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:07:21 sas Exp $ +dnl $Id: config.m4,v 1.4 2000/03/27 23:33:36 sas Exp $ -AC_MSG_CHECKING(whether to include the bundled dbase library) -AC_ARG_WITH(dbase, -[ --with-dbase Include the bundled dbase library], -[ - if test "$withval" = "yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE(DBASE,1,[ ]) - PHP_EXTENSION(dbase) - else - AC_MSG_RESULT(no) - AC_DEFINE(DBASE,0,[ ]) - fi -],[ - AC_MSG_RESULT(no) +AC_ARG_WITH(dbase,[],[enable_dbase=$withval]) + +PHP_ARG_ENABLE(dbase,whether to enable the bundled dbase library, +[ --enable-dbase Enable the bundled dbase library]) + +if test "$PHP_DBASE" = "yes"; then + AC_DEFINE(DBASE,1,[ ]) + PHP_EXTENSION(dbase) +else AC_DEFINE(DBASE,0,[ ]) -]) +fi Index: php4/ext/filepro/config.m4 diff -u php4/ext/filepro/config.m4:1.2 php4/ext/filepro/config.m4:1.3 --- php4/ext/filepro/config.m4:1.2 Wed Dec 29 20:07:22 1999 +++ php4/ext/filepro/config.m4 Mon Mar 27 15:33:36 2000 @@ -1,17 +1,13 @@ -dnl $Id: config.m4,v 1.2 1999/12/30 04:07:22 sas Exp $ +dnl $Id: config.m4,v 1.3 2000/03/27 23:33:36 sas Exp $ -AC_MSG_CHECKING(whether to include the bundled filePro support) -AC_ARG_WITH(filepro, -[ --with-filepro Include the bundled read-only filePro support],[ - if test "$withval" != "no"; then - AC_DEFINE(HAVE_FILEPRO, 1, [ ]) - AC_MSG_RESULT(yes) - PHP_EXTENSION(filepro) - else - AC_DEFINE(HAVE_FILEPRO, 0, [ ]) - AC_MSG_RESULT(no) - fi -],[ +AC_ARG_WITH(filepro,[],[enable_filepro=$withval]) + +PHP_ARG_ENABLE(filepro,whether to enable the bundled filePro support, +[ --enable-filepro Enable the bundled read-only filePro support]) + +if test "$PHP_FILEPRO" = "yes"; then + AC_DEFINE(HAVE_FILEPRO, 1, [ ]) + PHP_EXTENSION(filepro) +else AC_DEFINE(HAVE_FILEPRO, 0, [ ]) - AC_MSG_RESULT(no) -]) +fi Index: php4/ext/ftp/config.m4 diff -u php4/ext/ftp/config.m4:1.3 php4/ext/ftp/config.m4:1.4 --- php4/ext/ftp/config.m4:1.3 Wed Dec 29 20:52:01 1999 +++ php4/ext/ftp/config.m4 Mon Mar 27 15:33:37 2000 @@ -1,18 +1,11 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:52:01 sas Exp $ +dnl $Id: config.m4,v 1.4 2000/03/27 23:33:37 sas Exp $ dnl config.m4 for extension ftp dnl don't forget to call PHP_EXTENSION(ftp) -AC_MSG_CHECKING(for FTP support) -AC_ARG_WITH(ftp, -[ --with-ftp Include FTP support.], -[ - if test "$withval" != "no"; then - AC_DEFINE(HAVE_FTP,1,[ ]) - PHP_EXTENSION(ftp) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi -],[ - AC_MSG_RESULT(no) -]) +PHP_ARG_ENABLE(ftp,whether to enable FTP support, +[ --enable-ftp Enable FTP support]) + +if test "$PHP_FTP" = "yes"; then + AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support]) + PHP_EXTENSION(ftp) +fi Index: php4/ext/session/config.m4 diff -u php4/ext/session/config.m4:1.6 php4/ext/session/config.m4:1.7 --- php4/ext/session/config.m4:1.6 Sat Mar 25 18:47:00 2000 +++ php4/ext/session/config.m4 Mon Mar 27 15:33:37 2000 @@ -1,31 +1,13 @@ -dnl $Id: config.m4,v 1.6 2000/03/26 02:47:00 sas Exp $ +dnl $Id: config.m4,v 1.7 2000/03/27 23:33:37 sas Exp $ -AC_MSG_CHECKING(for mm support) -AC_ARG_WITH(mm, -[ --with-mm[=DIR] Include mm support for session storage],[ - PHP_MM=$withval -],[ - PHP_MM=no -]) -AC_MSG_RESULT($PHP_MM) +PHP_ARG_WITH(mm,for mm support, +[ --with-mm[=DIR] Include mm support for session storage]) -AC_MSG_CHECKING(whether to enable session support) -AC_ARG_ENABLE(session, -[ --disable-session Disable session support],[ - PHP_SESSION=$enableval -],[ - PHP_SESSION=yes -]) -AC_MSG_RESULT($PHP_SESSION) +PHP_ARG_ENABLE(session, whether to enable session support, +[ --disable-session Disable session support], yes) -AC_MSG_CHECKING(whether to enable transparent session id propagation) -AC_ARG_ENABLE(trans-sid, -[ --enable-trans-sid Enable transparent session id propagation],[ - PHP_TRANS_SID=$enableval -],[ - PHP_TRANS_SID=no -]) -AC_MSG_RESULT($PHP_TRANS_SID) +PHP_ARG_ENABLE(trans-sid,whether to enable transparent session id propagation, +[ --enable-trans-sid Enable transparent session id propagation]) if test "$PHP_MM" != "no"; then for i in /usr/local /usr $PHP_MM; do Index: php4/ext/wddx/config.m4 diff -u php4/ext/wddx/config.m4:1.5 php4/ext/wddx/config.m4:1.6 --- php4/ext/wddx/config.m4:1.5 Tue Feb 15 14:55:45 2000 +++ php4/ext/wddx/config.m4 Mon Mar 27 15:33:38 2000 @@ -1,20 +1,14 @@ -dnl $Id: config.m4,v 1.5 2000/02/15 22:55:45 andrei Exp $ +dnl $Id: config.m4,v 1.6 2000/03/27 23:33:38 sas Exp $ dnl config.m4 for extension wddx -AC_MSG_CHECKING(whether to include WDDX support) -AC_ARG_ENABLE(wddx, -[ --enable-wddx Include WDDX support],[ - if test "$enableval" = "yes"; then - if test "${enable_xml+set}" != "set" -o "$enable_xml" = "no"; then - AC_MSG_ERROR(WDDX requires --enable-xml) - else - AC_DEFINE(HAVE_WDDX, 1, [ ]) - AC_MSG_RESULT(yes) - PHP_EXTENSION(wddx) - fi - else - AC_MSG_RESULT(no) +PHP_ARG_ENABLE(wddx,whether to enable WDDX support, +[ --enable-wddx Enable WDDX support]) + +if test "$PHP_WDDX" = "yes"; then + if test "$enable_xml" = "no"; then + AC_MSG_WARN(Activating XML) + enable_xml=yes fi -],[ - AC_MSG_RESULT(no) -]) + AC_DEFINE(HAVE_WDDX, 1, [ ]) + PHP_EXTENSION(wddx) +fi