Added --without-pear option.

diff --git a/Makefile.am b/Makefile.am
index e3b7c0da15aaceaf10e3efd50074a0198c3a7685..6a07e0e363296e170122fb629d73656d97cfd545 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)
 

diff --git a/configure.in b/configure.in
index 1ebc0050f4112c11afa38441f5a4e60fb1d2235e..fbfe83eb0aaf2d99c91bfab2144eeb5de78b2cba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -605,6 +605,21 @@ AC_ARG_ENABLE(low-memory,
 ])
 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
 dnl paths to the targets relative to the build directory