[PHP-DOC] cvs: phpdoc / configure.in

[Hartmut Holzgraefe]

hholzgra                Tue Feb  8 07:47:10 2005 EDT

  Modified files:              
    /phpdoc     configure.in 
  Log:
  PEAR and PECL source detection modified and tested
  
  
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.212&r2=1.213&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.212 phpdoc/configure.in:1.213
--- phpdoc/configure.in:1.212   Tue Feb  8 07:12:31 2005
+++ phpdoc/configure.in Tue Feb  8 07:47:08 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.212 2005/02/08 12:12:31 hholzgra Exp $
+dnl $Id: configure.in,v 1.213 2005/02/08 12:47:08 hholzgra Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -412,20 +412,23 @@
 dnl {{{ check for PEAR sources
 
 AC_MSG_CHECKING(for PEAR source path)
-AC_ARG_WITH(pear,
-[  --with-pear-source=[DIR]  look at the specified pear directory],
+AC_ARG_WITH(pear-source,
+[  --with-pear-source=[DIR]  look at the specified PEAR directory],
 [
-  if test -d "$withval" ; then
-    PEAR_SOURCE=$withval
-  else
+  if test "$withval" = "yes"; then
     PEAR_SOURCE=$srcdir/../pear
+       if test ! -d $PEAR_SOURCE; then
+               PEAR_SOURCE=no
+       fi      
+  else
+    PEAR_SOURCE=$withval
+       if test ! -d $PEAR_SOURCE; then
+               AC_MSG_ERROR(['$withval' is not a valid directory']) 
+    fi
   fi
 ],[
-  PEAR_SOURCE=$srcdir/../pear
+  PEAR_SOURCE=no
 ])
-if test ! -d $PEAR_SOURCE/PECL; then
-       PEAR_SOURCE=no
-fi
 AC_MSG_RESULT($PEAR_SOURCE)
 AC_SUBST(PEAR_SOURCE)
 
@@ -434,20 +437,23 @@
 dnl {{{ check for PECL sources
 
 AC_MSG_CHECKING(for PECL source path)
-AC_ARG_WITH(pear,
-[  --with-pear-source=[DIR]  look at the specified pear directory],
+AC_ARG_WITH(pecl-source,
+[  --with-pecl-source=[DIR]  look at the specified PECL directory],
 [
-  if test -d "$withval" ; then
-    PECL_SOURCE=$withval
+  if test "$withval" = "yes"; then
+    PECL_SOURCE=$srcdir/../pecl
+       if test ! -d $PECL_SOURCE; then
+               PECL_SOURCE=no
+       fi      
   else
-    PECL_SOURCE=$srcdir/../pear
+    PECL_SOURCE=$withval
+       if test ! -d $PECL_SOURCE; then
+               AC_MSG_ERROR(['$withval' is not a valid directory']) 
+    fi
   fi
 ],[
-  PECL_SOURCE=$srcdir/../pear
+  PECL_SOURCE=no
 ])
-if test ! -d $PECL_SOURCE/PECL; then
-       PECL_SOURCE=no
-fi
 AC_MSG_RESULT($PECL_SOURCE)
 AC_SUBST(PECL_SOURCE)