cvs: php4 / configure.in /ext/ccvs config.m4 /ext/curl config.m4 /ext/cybercash config.m4 /ext/java config.m4 /ext/pfpro config.m4 /ext/pgsql
config.m4 /ext/sablot config.m4 /ext/shmop config.m4 /ext/sockets config.m4
| From: | Rasmus Lerdorf | Date: | Mon, 02 Oct 2000 17:35:59 +0000 |
| Subject: | cvs: php4 / configure.in /ext/ccvs config.m4 /ext/curl config.m4 /ext/cybercash config.m4 /ext/java config.m4 /ext/pfpro config.m4 /ext/pgsql config.m4 /ext/sablot config.m4 /ext/shmop config.m4 /ext/sockets config.m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1913@lists.php.net to get a copy of this message | ||
rasmus Mon Oct 2 10:35:59 2000 EDT
Modified files:
/php4 configure.in
/php4/ext/ccvs config.m4
/php4/ext/curl config.m4
/php4/ext/cybercash config.m4
/php4/ext/java config.m4
/php4/ext/pfpro config.m4
/php4/ext/pgsql config.m4
/php4/ext/sablot config.m4
/php4/ext/shmop config.m4
/php4/ext/sockets config.m4
Log:
Clean up the alignment of configure --help output
Index: php4/configure.in
diff -u php4/configure.in:1.183 php4/configure.in:1.184
--- php4/configure.in:1.183 Tue Sep 26 04:19:38 2000
+++ php4/configure.in Mon Oct 2 10:35:56 2000
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.183 2000/09/26 11:19:38 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.184 2000/10/02 17:35:56 rasmus Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -456,7 +456,7 @@
fi
PHP_ARG_ENABLE(debug, whether to include debugging symbols,
-[ --enable-debug Compile with debugging symbols.], no)
+[ --enable-debug Compile with debugging symbols.], no)
if test "$PHP_DEBUG" = "yes"; then
PHP_DEBUG=1
Index: php4/ext/ccvs/config.m4
diff -u php4/ext/ccvs/config.m4:1.4 php4/ext/ccvs/config.m4:1.5
--- php4/ext/ccvs/config.m4:1.4 Wed Aug 9 09:45:49 2000
+++ php4/ext/ccvs/config.m4 Mon Oct 2 10:35:56 2000
@@ -1,10 +1,10 @@
-dnl $Id: config.m4,v 1.4 2000/08/09 16:45:49 bmcadams Exp $
+dnl $Id: config.m4,v 1.5 2000/10/02 17:35:56 rasmus 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
Index: php4/ext/curl/config.m4
diff -u php4/ext/curl/config.m4:1.2 php4/ext/curl/config.m4:1.3
--- php4/ext/curl/config.m4:1.2 Mon Jul 24 12:59:59 2000
+++ php4/ext/curl/config.m4 Mon Oct 2 10:35:57 2000
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.2 2000/07/24 19:59:59 sterling Exp $
+dnl $Id: config.m4,v 1.3 2000/10/02 17:35:57 rasmus Exp $
dnl config.m4 for extension CURL
PHP_ARG_WITH(curl, for CURL support,
-[ --with-curl[=DIR] Include CURL support])
+[ --with-curl[=DIR] Include CURL support])
if test "$PHP_CURL" != "no"; then
if test -r $PHP_CURL/include/curl/easy.h; then
@@ -31,4 +31,4 @@
AC_DEFINE(HAVE_CURL,1,[ ])
PHP_EXTENSION(curl, $ext_shared)
-fi
\ No newline at end of file
+fi
Index: php4/ext/cybercash/config.m4
diff -u php4/ext/cybercash/config.m4:1.5 php4/ext/cybercash/config.m4:1.6
--- php4/ext/cybercash/config.m4:1.5 Wed Mar 1 18:05:39 2000
+++ php4/ext/cybercash/config.m4 Mon Oct 2 10:35:57 2000
@@ -4,7 +4,7 @@
AC_MSG_CHECKING(for CyberCash support)
AC_ARG_WITH(cybercash,
[ --with-cybercash[=DIR] Include CyberCash support. DIR is the CyberCash MCK
- install directory.],
+ install directory.],
[
if test "$withval" != "no"; then
test -f $withval/mckcrypt.h && MCK_DIR="$withval"
Index: php4/ext/java/config.m4
diff -u php4/ext/java/config.m4:1.18 php4/ext/java/config.m4:1.19
--- php4/ext/java/config.m4:1.18 Tue Jul 11 10:33:13 2000
+++ php4/ext/java/config.m4 Mon Oct 2 10:35:57 2000
@@ -1,11 +1,11 @@
-# $Id: config.m4,v 1.18 2000/07/11 17:33:13 rubys Exp $
+# $Id: config.m4,v 1.19 2000/10/02 17:35:57 rasmus Exp $
# config.m4 for extension java
AC_MSG_CHECKING(for Java support)
AC_ARG_WITH(java,
-[ --with-java[=DIR] Include Java support. DIR is the base install
- directory for the JDK. This extension can only
- be built as a shared dl.],
+[ --with-java[=DIR] Include Java support. DIR is the base install
+ directory for the JDK. This extension can only
+ be built as a shared dl.],
[
if test "$withval" != "no"; then
JAVA_SHARED="libphp_java.la"
Index: php4/ext/pfpro/config.m4
diff -u php4/ext/pfpro/config.m4:1.2 php4/ext/pfpro/config.m4:1.3
--- php4/ext/pfpro/config.m4:1.2 Fri Jul 14 22:08:21 2000
+++ php4/ext/pfpro/config.m4 Mon Oct 2 10:35:57 2000
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.2 2000/07/15 05:08:21 david Exp $
+dnl $Id: config.m4,v 1.3 2000/10/02 17:35:57 rasmus Exp $
dnl config.m4 for extension pfpro
PHP_ARG_WITH(pfpro, whether to include Verisign Payflow Pro support,
-[ --with-pfpro[=DIR] Include Verisign Payflow Pro support])
+[ --with-pfpro[=DIR] Include Verisign Payflow Pro support])
if test "$PHP_PFPRO" != "no"; then
Index: php4/ext/pgsql/config.m4
diff -u php4/ext/pgsql/config.m4:1.16 php4/ext/pgsql/config.m4:1.17
--- php4/ext/pgsql/config.m4:1.16 Fri Jul 28 21:24:11 2000
+++ php4/ext/pgsql/config.m4 Mon Oct 2 10:35:57 2000
@@ -1,11 +1,11 @@
-dnl $Id: config.m4,v 1.16 2000/07/29 04:24:11 jah Exp $
+dnl $Id: config.m4,v 1.17 2000/10/02 17:35:57 rasmus Exp $
AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; PGSQL_INCDIR=$i$1])
PHP_ARG_WITH(pgsql,for PostgreSQL support,
[ --with-pgsql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL
base install directory, defaults to /usr/local/pgsql.
- Set DIR to "shared" to build as a dl, or "shared,DIR"
+ Set DIR to "shared" to build as a dl, or "shared,DIR"
to build as a dl and still specify DIR.])
if test "$PHP_PGSQL" != "no"; then
Index: php4/ext/sablot/config.m4
diff -u php4/ext/sablot/config.m4:1.3 php4/ext/sablot/config.m4:1.4
--- php4/ext/sablot/config.m4:1.3 Fri Sep 29 21:50:39 2000
+++ php4/ext/sablot/config.m4 Mon Oct 2 10:35:58 2000
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.3 2000/09/30 04:50:39 sterling Exp $
+dnl $Id: config.m4,v 1.4 2000/10/02 17:35:58 rasmus Exp $
dnl config.m4 for extension Sablot
PHP_ARG_WITH(sablot, for Sablotron XSL support,
-[ --with-sablot[=DIR] Include Sablotron support])
+[ --with-sablot[=DIR] Include Sablotron support])
if test "$PHP_SABLOT" != "no"; then
if test -r $PHP_SABLOT/include/sablot.h; then
Index: php4/ext/shmop/config.m4
diff -u php4/ext/shmop/config.m4:1.1 php4/ext/shmop/config.m4:1.2
--- php4/ext/shmop/config.m4:1.1 Sun Oct 1 08:06:04 2000
+++ php4/ext/shmop/config.m4 Mon Oct 2 10:35:58 2000
@@ -1,6 +1,6 @@
-dnl $Id: config.m4,v 1.1 2000/10/01 15:06:04 derick Exp $
+dnl $Id: config.m4,v 1.2 2000/10/02 17:35:58 rasmus Exp $
PHP_ARG_ENABLE(shmop, whether to enable shmop support,
-[ --enable-shmop Enable shmop support])
+[ --enable-shmop Enable shmop support])
if test "$PHP_SHMOP" != "no"; then
AC_DEFINE(HAVE_SHMOP, 1, [ ])
Index: php4/ext/sockets/config.m4
diff -u php4/ext/sockets/config.m4:1.2 php4/ext/sockets/config.m4:1.3
--- php4/ext/sockets/config.m4:1.2 Sun Jul 2 22:25:00 2000
+++ php4/ext/sockets/config.m4 Mon Oct 2 10:35:58 2000
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.2 2000/07/03 05:25:00 rasmus Exp $
+dnl $Id: config.m4,v 1.3 2000/10/02 17:35:58 rasmus Exp $
dnl config.m4 for extension sockets
dnl don't forget to call PHP_EXTENSION(sockets)
@@ -10,13 +10,13 @@
dnl PHP_ARG_WITH(sockets, for sockets support,
dnl Make sure that the comment is aligned:
-dnl [ --with-sockets Include sockets support])
+dnl [ --with-sockets Include sockets support])
dnl Otherwise use enable:
PHP_ARG_ENABLE(sockets, whether to enable sockets support,
dnl Make sure that the comment is aligned:
-[ --enable-sockets Enable sockets support])
+[ --enable-sockets Enable sockets support])
if test "$PHP_SOCKETS" != "no"; then
dnl If you will not be testing anything external, like existence of