cvs: php-src /ext/pdo config.m4
| From: | Jani Taskinen | Date: | Fri, 06 May 2005 22:58:43 +0000 |
| Subject: | cvs: php-src /ext/pdo config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31756@lists.php.net to get a copy of this message | ||
sniper Fri May 6 18:58:43 2005 EDT
Modified files:
/php-src/ext/pdo config.m4
Log:
Only test stuff if PDO is enabled
http://cvs.php.net/diff.php/php-src/ext/pdo/config.m4?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/pdo/config.m4
diff -u php-src/ext/pdo/config.m4:1.10 php-src/ext/pdo/config.m4:1.11
--- php-src/ext/pdo/config.m4:1.10 Thu Feb 17 20:39:36 2005
+++ php-src/ext/pdo/config.m4 Fri May 6 18:58:42 2005
@@ -1,19 +1,20 @@
-dnl $Id: config.m4,v 1.10 2005/02/18 01:39:36 wez Exp $
+dnl $Id: config.m4,v 1.11 2005/05/06 22:58:42 sniper Exp $
dnl config.m4 for extension pdo
dnl vim:se ts=2 sw=2 et:
-pdo_running_under_pear=0
-case
pwd in
- /var/tmp/pear-build-*)
- pdo_running_under_pear=1
- ;;
-esac
-
-if test "$pdo_running_under_pear$PHP_PEAR_VERSION" = "1"; then
- # we're running in an environment that smells like pear,
- # and the PHP_PEAR_VERSION env var is not set. That implies
- # that we're running under a slightly broken pear installer
- AC_MSG_ERROR([
+AC_DEFUN([PHP_PDO_PEAR_CHECK],[
+ pdo_running_under_pear=0
+ case pwd in
+ /var/tmp/pear-build-*)
+ pdo_running_under_pear=1
+ ;;
+ esac
+
+ if test "$pdo_running_under_pear$PHP_PEAR_VERSION" = "1"; then
+ # we're running in an environment that smells like pear,
+ # and the PHP_PEAR_VERSION env var is not set. That implies
+ # that we're running under a slightly broken pear installer
+ AC_MSG_ERROR([
PDO requires that you upgrade your PEAR installer tools. Please
do so now by running:
@@ -22,13 +23,17 @@
or by manually downloading and installing PEAR version 1.3.5 or higher.
Once you've upgraded, please re-try your PDO install.
+ ])
+ fi
])
-fi
PHP_ARG_ENABLE(pdo, whether to enable PDO support,
[ --enable-pdo=yes Enable PHP Data Objects support (recommended)], yes)
if test "$PHP_PDO" != "no"; then
+
+ PHP_PDO_PEAR_CHECK
+
if test "$ext_shared" = "yes" ; then
case $host_alias in
*darwin*)