cvs: /php4 Makefile.am configure.in
| From: | Andrei Zmievski | Date: | Sat, 18 Dec 1999 23:26:26 +0000 |
| Subject: | cvs: /php4 Makefile.am configure.in | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-8156@lists.php.net to get a copy of this message | ||
andrei Sat Dec 18 18:26:26 1999 EDT
Modified files:
/php4 Makefile.am configure.in
Log:
Added --without-pear option.
Index: php4/Makefile.am
diff -u php4/Makefile.am:1.17 php4/Makefile.am:1.18
--- php4/Makefile.am:1.17 Fri Dec 17 14:50:56 1999
+++ php4/Makefile.am Sat Dec 18 18:25:55 1999
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign
ZEND_DIR = $(srcdir)/libzend
-SUBDIRS = libzend ext sapi $(TSRM_DIR) $(REGEX_DIR) . pear
+SUBDIRS = libzend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
BUILDLDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS)
Index: php4/configure.in
diff -u php4/configure.in:1.68 php4/configure.in:1.69
--- php4/configure.in:1.68 Fri Dec 17 09:36:53 1999
+++ php4/configure.in Sat Dec 18 18:25:55 1999
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.68 1999/12/17 14:36:53 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.69 1999/12/18 23:25:55 andrei Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(0)
@@ -604,6 +604,21 @@
PHP_LOW_MEMORY=no
])
AC_MSG_RESULT($PHP_LOW_MEMORY)
+
+AC_MSG_CHECKING(whether to install PEAR)
+AC_ARG_WITH(pear,
+[ --without-pear Do not install PEAR],[
+ if test "$withval" = "yes"; then
+ PEAR_DIR=pear
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+],[
+ PEAR_DIR=pear
+ AC_MSG_RESULT(yes)
+])
+AC_SUBST(PEAR_DIR)
PHP_SAPI=cgi
PHP_BUILD_PROGRAM