cvs: php4(php_4_0_4) /ext/bcmath config.m4 /ext/ccvs config.m4 /ext/ctype config.m4 /ext/domxml config.m4 /ext/fribidi config.m4 /ext/gd
config.m4 /ext/gmp config.m4 /ext/qtdom config.m4 /sapi/thttpd config.m4
| From: | Sascha Schumann | Date: | Wed, 06 Dec 2000 17:41:41 +0000 |
| Subject: | cvs: php4(php_4_0_4) /ext/bcmath config.m4 /ext/ccvs config.m4 /ext/ctype config.m4 /ext/domxml config.m4 /ext/fribidi config.m4 /ext/gd config.m4 /ext/gmp config.m4 /ext/qtdom config.m4 /sapi/thttpd config.m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2972@lists.php.net to get a copy of this message | ||
sas Wed Dec 6 09:41:41 2000 EDT
Branch: php_4_0_4
Modified files:
/php4/sapi/thttpd config.m4
/php4/ext/gmp config.m4
/php4/ext/qtdom config.m4
/php4/ext/fribidi config.m4
/php4/ext/ctype config.m4
/php4/ext/ccvs config.m4
/php4/ext/gd config.m4
/php4/ext/domxml config.m4
/php4/ext/bcmath config.m4
Log:
Merge HEAD changes
Index: php4/sapi/thttpd/config.m4 diff -u php4/sapi/thttpd/config.m4:1.3 php4/sapi/thttpd/config.m4:1.3.2.1 --- php4/sapi/thttpd/config.m4:1.3 Mon Aug 7 06:54:35 2000 +++ php4/sapi/thttpd/config.m4 Wed Dec 6 09:41:38 2000 @@ -1,5 +1,5 @@ AC_ARG_WITH(thttpd, -[ --with-thttpd=SRCDIR],[ +[ --with-thttpd=SRCDIR Build PHP as thttpd module],[ test -d $withval || AC_MSG_RESULT(thttpd directory does not exist ($withval)) AC_EXPAND_PATH($withval, THTTPD) INSTALL_IT="\ Index: php4/ext/gmp/config.m4 diff -u php4/ext/gmp/config.m4:1.2 php4/ext/gmp/config.m4:1.2.2.1 --- php4/ext/gmp/config.m4:1.2 Wed Nov 29 07:49:18 2000 +++ php4/ext/gmp/config.m4 Wed Dec 6 09:41:39 2000 @@ -1,11 +1,11 @@ -dnl $Id: config.m4,v 1.2 2000/11/29 15:49:18 stas Exp $ +dnl $Id: config.m4,v 1.2.2.1 2000/12/06 17:41:39 sas Exp $ dnl config.m4 for extension gmp dnl If your extension references something external, use with: PHP_ARG_WITH(gmp, for gmp support, dnl Make sure that the comment is aligned: -[ --with-gmp Include gmp support]) +[ --with-gmp Include gmp support]) if test "$PHP_GMP" != "no"; then Index: php4/ext/qtdom/config.m4 diff -u php4/ext/qtdom/config.m4:1.1 php4/ext/qtdom/config.m4:1.1.2.1 --- php4/ext/qtdom/config.m4:1.1 Wed Nov 15 10:54:59 2000 +++ php4/ext/qtdom/config.m4 Wed Dec 6 09:41:39 2000 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.1 2000/11/15 18:54:59 amos Exp $ +dnl $Id: config.m4,v 1.1.2.1 2000/12/06 17:41:39 sas Exp $ dnl config.m4 for extension qtdom dnl don't forget to call PHP_EXTENSION(qtdom) AC_MSG_CHECKING(whether to include QDOM support) AC_ARG_WITH(qtdom, -[ --with-qtdom Include QtDOM support (requires Qt >= 2.2.0).], +[ --with-qtdom Include QtDOM support (requires Qt >= 2.2.0).], [ case "$withval" in no) Index: php4/ext/fribidi/config.m4 diff -u php4/ext/fribidi/config.m4:1.1 php4/ext/fribidi/config.m4:1.1.2.1 --- php4/ext/fribidi/config.m4:1.1 Mon Nov 13 07:57:57 2000 +++ php4/ext/fribidi/config.m4 Wed Dec 6 09:41:39 2000 @@ -1,13 +1,13 @@ -dnl $Id: config.m4,v 1.1 2000/11/13 15:57:57 onn Exp $ +dnl $Id: config.m4,v 1.1.2.1 2000/12/06 17:41:39 sas Exp $ dnl config.m4 for extension fribidi dnl don't forget to call PHP_EXTENSION(fribidi) PHP_ARG_WITH(fribidi, whether to add fribidi support, -[ --with-fribidi[=DIR] Include fribidi support (requires FriBidi >=0.1.12). - DIR is the fribidi installation directory - - default /usr/local/],"no") +[ --with-fribidi[=DIR] Include fribidi support (requires FriBidi >=0.1.12). + DIR is the fribidi installation directory - + default /usr/local/]) Index: php4/ext/ctype/config.m4 diff -u php4/ext/ctype/config.m4:1.1 php4/ext/ctype/config.m4:1.1.2.1 --- php4/ext/ctype/config.m4:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/config.m4 Wed Dec 6 09:41:39 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2000/11/22 01:00:44 hholzgra Exp $ +dnl $Id: config.m4,v 1.1.2.1 2000/12/06 17:41:39 sas Exp $ dnl config.m4 for extension ctype dnl don't forget to call PHP_EXTENSION(ctype) @@ -14,7 +14,8 @@ dnl Otherwise use enable: -PHP_ARG_ENABLE(ctype, whether to enable ctype support,[ --enable-ctype Enable ctype support]) +PHP_ARG_ENABLE(ctype, whether to enable ctype support, +[ --enable-ctype Enable ctype support]) if test "$PHP_CTYPE" != "no"; then dnl If you will not be testing anything external, like existence of Index: php4/ext/ccvs/config.m4 diff -u php4/ext/ccvs/config.m4:1.5 php4/ext/ccvs/config.m4:1.5.2.1 --- php4/ext/ccvs/config.m4:1.5 Mon Oct 2 10:35:56 2000 +++ php4/ext/ccvs/config.m4 Wed Dec 6 09:41:40 2000 @@ -1,11 +1,10 @@ -dnl $Id: config.m4,v 1.5 2000/10/02 17:35:56 rasmus Exp $ +dnl $Id: config.m4,v 1.5.2.1 2000/12/06 17:41:40 sas Exp $ dnl config.m4 for PHP4 CCVS Extension AC_MSG_CHECKING(CCVS Support) AC_ARG_WITH(ccvs, -[ --with-ccvs[=DIR] Compile CCVS support into PHP4. - Please specify your CCVS base install directory as DIR. -], +[ --with-ccvs[=DIR] Compile CCVS support into PHP4. Please specify your + CCVS base install directory as DIR.], [ if test "$withval" != "no"; then CCVS_DIR="$withval" Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.49 php4/ext/gd/config.m4:1.49.2.1 --- php4/ext/gd/config.m4:1.49 Tue Nov 28 00:06:30 2000 +++ php4/ext/gd/config.m4 Wed Dec 6 09:41:40 2000 @@ -6,11 +6,16 @@ if test "$withval" = "yes"; then withval="/usr/local" fi - old_LIBS=$LIBS + jold_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(jpeg,jpeg_read_header, [LIBS="$LIBS -ljpeg"],[AC_MSG_RESULT(no)],) - LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) + LIBS=$jold_LIBS + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -ljpeg" + GD_LFLAGS="$GD_LFLAGS -L$withval/lib" + else + AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) + fi LIBS="$LIBS -L$withval/lib -ljpeg" ],[ AC_MSG_RESULT(no) @@ -58,7 +63,7 @@ AC_MSG_CHECKING(whether to enable truetype string function in gd) AC_ARG_ENABLE(gd-native-ttf, -[ --enable-gd-imgstrttf Enable TrueType string function in gd],[ +[ --enable-gd-imgstrttf Enable TrueType string function in gd],[ if test "$enableval" = "yes" ; then AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) AC_MSG_RESULT(yes) @@ -72,8 +77,7 @@ shared=no AC_ARG_WITH(gd, -[ - --with-gd[=DIR] Include GD support (DIR is GD's install dir). +[ --with-gd[=DIR] Include GD support (DIR is GD's install dir). Set DIR to "shared" to build as a dl, or "shared,DIR" to build as a dl and still specify DIR.], [ @@ -93,7 +97,7 @@ AC_DEFINE(HAVE_LIBGD,1,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) - GD_LIBS="-lgd" + GD_LIBS="-lgd $GD_LIBS" else AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY(gd) @@ -110,6 +114,9 @@ if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then AC_ADD_LIBRARY(png) AC_ADD_LIBRARY(z) + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lpng -lz" + fi fi ac_cv_lib_gd_gdImageLine=yes @@ -142,8 +149,8 @@ AC_DEFINE(HAVE_LIBGD,1,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) - GD_LIBS="-lgd" - GD_LFLAGS="-L$GD_LIB" + GD_LIBS="-lgd $GD_LIBS" + GD_LFLAGS="-L$GD_LIB $GD_LFLAGS" else AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB) @@ -160,6 +167,9 @@ if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then AC_ADD_LIBRARY(z) AC_ADD_LIBRARY(png) + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lpng -lz" + fi fi ac_cv_lib_gd_gdImageLine=yes @@ -222,16 +232,26 @@ if test "$withval" = "yes"; then for i in /usr/local /usr; do if test -f "$i/include/t1lib.h"; then - AC_ADD_LIBRARY_WITH_PATH(t1, "$i/lib") - AC_ADD_INCLUDE("$i/include") + T1_DIR="$i" fi done else if test -f "$withval/include/t1lib.h"; then - AC_ADD_LIBRARY_WITH_PATH(t1, "$withval/lib") - AC_ADD_INCLUDE("$withval/include") + T1_DIR="$withval" fi fi + + if test "$T1_DIR" != "no"; then + AC_ADD_INCLUDE("$T1_DIR/include") + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lt1" + GD_LFLAGS="$GD_LFLAGS -L$T1_DIR/lib" + else + AC_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib") + fi + LIBS="$LIBS -L$T1_DIR/lib -lt1" + fi + AC_MSG_RESULT(yes) AC_CHECK_LIB(t1, T1_GetExtend, [AC_DEFINE(HAVE_LIBT1,1,[ ])]) else Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.16 php4/ext/domxml/config.m4:1.16.2.1 --- php4/ext/domxml/config.m4:1.16 Thu Nov 23 01:56:18 2000 +++ php4/ext/domxml/config.m4 Wed Dec 6 09:41:40 2000 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.16 2000/11/23 09:56:18 steinm Exp $ +dnl $Id: config.m4,v 1.16.2.1 2000/12/06 17:41:40 sas Exp $ dnl config.m4 for extension domxml PHP_ARG_WITH(dom, for DOM support, -[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.0). +[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.0). DIR is the libxml install directory, defaults to /usr.]) Index: php4/ext/bcmath/config.m4 diff -u php4/ext/bcmath/config.m4:1.11 php4/ext/bcmath/config.m4:1.11.2.1 --- php4/ext/bcmath/config.m4:1.11 Thu Nov 30 07:20:40 2000 +++ php4/ext/bcmath/config.m4 Wed Dec 6 09:41:40 2000 @@ -1,7 +1,7 @@ -dnl $Id: config.m4,v 1.11 2000/11/30 15:20:40 sterling Exp $ +dnl $Id: config.m4,v 1.11.2.1 2000/12/06 17:41:40 sas Exp $ -PHP_ARG_WITH(bcmath, for bc style precision math functions, -[ --without-bcmath Compile without bc style precision math functions. ], yes) +PHP_ARG_ENABLE(bcmath, for bc style precision math functions, +[ --enable-bcmath Enable bc style precision math functions.]) if test "$PHP_BCMATH" != "no"; then AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
Index: php4/sapi/thttpd/config.m4 diff -u php4/sapi/thttpd/config.m4:1.3 php4/sapi/thttpd/config.m4:1.3.2.1 --- php4/sapi/thttpd/config.m4:1.3 Mon Aug 7 06:54:35 2000 +++ php4/sapi/thttpd/config.m4 Wed Dec 6 09:41:38 2000 @@ -1,5 +1,5 @@ AC_ARG_WITH(thttpd, -[ --with-thttpd=SRCDIR],[ +[ --with-thttpd=SRCDIR Build PHP as thttpd module],[ test -d $withval || AC_MSG_RESULT(thttpd directory does not exist ($withval)) AC_EXPAND_PATH($withval, THTTPD) INSTALL_IT="\ Index: php4/ext/gmp/config.m4 diff -u php4/ext/gmp/config.m4:1.2 php4/ext/gmp/config.m4:1.2.2.1 --- php4/ext/gmp/config.m4:1.2 Wed Nov 29 07:49:18 2000 +++ php4/ext/gmp/config.m4 Wed Dec 6 09:41:39 2000 @@ -1,11 +1,11 @@ -dnl $Id: config.m4,v 1.2 2000/11/29 15:49:18 stas Exp $ +dnl $Id: config.m4,v 1.2.2.1 2000/12/06 17:41:39 sas Exp $ dnl config.m4 for extension gmp dnl If your extension references something external, use with: PHP_ARG_WITH(gmp, for gmp support, dnl Make sure that the comment is aligned: -[ --with-gmp Include gmp support]) +[ --with-gmp Include gmp support]) if test "$PHP_GMP" != "no"; then Index: php4/ext/qtdom/config.m4 diff -u php4/ext/qtdom/config.m4:1.1 php4/ext/qtdom/config.m4:1.1.2.1 --- php4/ext/qtdom/config.m4:1.1 Wed Nov 15 10:54:59 2000 +++ php4/ext/qtdom/config.m4 Wed Dec 6 09:41:39 2000 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.1 2000/11/15 18:54:59 amos Exp $ +dnl $Id: config.m4,v 1.1.2.1 2000/12/06 17:41:39 sas Exp $ dnl config.m4 for extension qtdom dnl don't forget to call PHP_EXTENSION(qtdom) AC_MSG_CHECKING(whether to include QDOM support) AC_ARG_WITH(qtdom, -[ --with-qtdom Include QtDOM support (requires Qt >= 2.2.0).], +[ --with-qtdom Include QtDOM support (requires Qt >= 2.2.0).], [ case "$withval" in no) Index: php4/ext/fribidi/config.m4 diff -u php4/ext/fribidi/config.m4:1.1 php4/ext/fribidi/config.m4:1.1.2.1 --- php4/ext/fribidi/config.m4:1.1 Mon Nov 13 07:57:57 2000 +++ php4/ext/fribidi/config.m4 Wed Dec 6 09:41:39 2000 @@ -1,13 +1,13 @@ -dnl $Id: config.m4,v 1.1 2000/11/13 15:57:57 onn Exp $ +dnl $Id: config.m4,v 1.1.2.1 2000/12/06 17:41:39 sas Exp $ dnl config.m4 for extension fribidi dnl don't forget to call PHP_EXTENSION(fribidi) PHP_ARG_WITH(fribidi, whether to add fribidi support, -[ --with-fribidi[=DIR] Include fribidi support (requires FriBidi >=0.1.12). - DIR is the fribidi installation directory - - default /usr/local/],"no") +[ --with-fribidi[=DIR] Include fribidi support (requires FriBidi >=0.1.12). + DIR is the fribidi installation directory - + default /usr/local/]) Index: php4/ext/ctype/config.m4 diff -u php4/ext/ctype/config.m4:1.1 php4/ext/ctype/config.m4:1.1.2.1 --- php4/ext/ctype/config.m4:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/config.m4 Wed Dec 6 09:41:39 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2000/11/22 01:00:44 hholzgra Exp $ +dnl $Id: config.m4,v 1.1.2.1 2000/12/06 17:41:39 sas Exp $ dnl config.m4 for extension ctype dnl don't forget to call PHP_EXTENSION(ctype) @@ -14,7 +14,8 @@ dnl Otherwise use enable: -PHP_ARG_ENABLE(ctype, whether to enable ctype support,[ --enable-ctype Enable ctype support]) +PHP_ARG_ENABLE(ctype, whether to enable ctype support, +[ --enable-ctype Enable ctype support]) if test "$PHP_CTYPE" != "no"; then dnl If you will not be testing anything external, like existence of Index: php4/ext/ccvs/config.m4 diff -u php4/ext/ccvs/config.m4:1.5 php4/ext/ccvs/config.m4:1.5.2.1 --- php4/ext/ccvs/config.m4:1.5 Mon Oct 2 10:35:56 2000 +++ php4/ext/ccvs/config.m4 Wed Dec 6 09:41:40 2000 @@ -1,11 +1,10 @@ -dnl $Id: config.m4,v 1.5 2000/10/02 17:35:56 rasmus Exp $ +dnl $Id: config.m4,v 1.5.2.1 2000/12/06 17:41:40 sas Exp $ dnl config.m4 for PHP4 CCVS Extension AC_MSG_CHECKING(CCVS Support) AC_ARG_WITH(ccvs, -[ --with-ccvs[=DIR] Compile CCVS support into PHP4. - Please specify your CCVS base install directory as DIR. -], +[ --with-ccvs[=DIR] Compile CCVS support into PHP4. Please specify your + CCVS base install directory as DIR.], [ if test "$withval" != "no"; then CCVS_DIR="$withval" Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.49 php4/ext/gd/config.m4:1.49.2.1 --- php4/ext/gd/config.m4:1.49 Tue Nov 28 00:06:30 2000 +++ php4/ext/gd/config.m4 Wed Dec 6 09:41:40 2000 @@ -6,11 +6,16 @@ if test "$withval" = "yes"; then withval="/usr/local" fi - old_LIBS=$LIBS + jold_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(jpeg,jpeg_read_header, [LIBS="$LIBS -ljpeg"],[AC_MSG_RESULT(no)],) - LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) + LIBS=$jold_LIBS + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -ljpeg" + GD_LFLAGS="$GD_LFLAGS -L$withval/lib" + else + AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) + fi LIBS="$LIBS -L$withval/lib -ljpeg" ],[ AC_MSG_RESULT(no) @@ -58,7 +63,7 @@ AC_MSG_CHECKING(whether to enable truetype string function in gd) AC_ARG_ENABLE(gd-native-ttf, -[ --enable-gd-imgstrttf Enable TrueType string function in gd],[ +[ --enable-gd-imgstrttf Enable TrueType string function in gd],[ if test "$enableval" = "yes" ; then AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) AC_MSG_RESULT(yes) @@ -72,8 +77,7 @@ shared=no AC_ARG_WITH(gd, -[ - --with-gd[=DIR] Include GD support (DIR is GD's install dir). +[ --with-gd[=DIR] Include GD support (DIR is GD's install dir). Set DIR to "shared" to build as a dl, or "shared,DIR" to build as a dl and still specify DIR.], [ @@ -93,7 +97,7 @@ AC_DEFINE(HAVE_LIBGD,1,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) - GD_LIBS="-lgd" + GD_LIBS="-lgd $GD_LIBS" else AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY(gd) @@ -110,6 +114,9 @@ if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then AC_ADD_LIBRARY(png) AC_ADD_LIBRARY(z) + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lpng -lz" + fi fi ac_cv_lib_gd_gdImageLine=yes @@ -142,8 +149,8 @@ AC_DEFINE(HAVE_LIBGD,1,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) - GD_LIBS="-lgd" - GD_LFLAGS="-L$GD_LIB" + GD_LIBS="-lgd $GD_LIBS" + GD_LFLAGS="-L$GD_LIB $GD_LFLAGS" else AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB) @@ -160,6 +167,9 @@ if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then AC_ADD_LIBRARY(z) AC_ADD_LIBRARY(png) + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lpng -lz" + fi fi ac_cv_lib_gd_gdImageLine=yes @@ -222,16 +232,26 @@ if test "$withval" = "yes"; then for i in /usr/local /usr; do if test -f "$i/include/t1lib.h"; then - AC_ADD_LIBRARY_WITH_PATH(t1, "$i/lib") - AC_ADD_INCLUDE("$i/include") + T1_DIR="$i" fi done else if test -f "$withval/include/t1lib.h"; then - AC_ADD_LIBRARY_WITH_PATH(t1, "$withval/lib") - AC_ADD_INCLUDE("$withval/include") + T1_DIR="$withval" fi fi + + if test "$T1_DIR" != "no"; then + AC_ADD_INCLUDE("$T1_DIR/include") + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lt1" + GD_LFLAGS="$GD_LFLAGS -L$T1_DIR/lib" + else + AC_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib") + fi + LIBS="$LIBS -L$T1_DIR/lib -lt1" + fi + AC_MSG_RESULT(yes) AC_CHECK_LIB(t1, T1_GetExtend, [AC_DEFINE(HAVE_LIBT1,1,[ ])]) else Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.16 php4/ext/domxml/config.m4:1.16.2.1 --- php4/ext/domxml/config.m4:1.16 Thu Nov 23 01:56:18 2000 +++ php4/ext/domxml/config.m4 Wed Dec 6 09:41:40 2000 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.16 2000/11/23 09:56:18 steinm Exp $ +dnl $Id: config.m4,v 1.16.2.1 2000/12/06 17:41:40 sas Exp $ dnl config.m4 for extension domxml PHP_ARG_WITH(dom, for DOM support, -[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.0). +[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.0). DIR is the libxml install directory, defaults to /usr.]) Index: php4/ext/bcmath/config.m4 diff -u php4/ext/bcmath/config.m4:1.11 php4/ext/bcmath/config.m4:1.11.2.1 --- php4/ext/bcmath/config.m4:1.11 Thu Nov 30 07:20:40 2000 +++ php4/ext/bcmath/config.m4 Wed Dec 6 09:41:40 2000 @@ -1,7 +1,7 @@ -dnl $Id: config.m4,v 1.11 2000/11/30 15:20:40 sterling Exp $ +dnl $Id: config.m4,v 1.11.2.1 2000/12/06 17:41:40 sas Exp $ -PHP_ARG_WITH(bcmath, for bc style precision math functions, -[ --without-bcmath Compile without bc style precision math functions. ], yes) +PHP_ARG_ENABLE(bcmath, for bc style precision math functions, +[ --enable-bcmath Enable bc style precision math functions.]) if test "$PHP_BCMATH" != "no"; then AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])