wez Thu Feb 17 20:39:37 2005 EDT Modified files: /php-src/ext/pdo Makefile.frag config.m4 package.xml Log: Update for pending PEAR release. http://cvs.php.net/diff.php/php-src/ext/pdo/Makefile.frag?r1=1.8&r2=1.9&ty=u Index: php-src/ext/pdo/Makefile.frag diff -u php-src/ext/pdo/Makefile.frag:1.8 php-src/ext/pdo/Makefile.frag:1.9 --- php-src/ext/pdo/Makefile.frag:1.8 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo/Makefile.frag Thu Feb 17 20:39:36 2005 @@ -20,14 +20,6 @@ echo "hmmm"; \ fi \ done; - @echo "" - @echo "" - @echo "You're now ready to install PDO drivers for your database" - @echo "If you'd like to have PDO show up in the list of installed" - @echo "packages when you run \"pear list\", you may now run" - @echo "\"sudo pear install package.xml\"" - @echo "this time, when prompted to press enter, you should type" - @echo "\"no\" and press enter instead." # mini hack install: $(all_targets) $(install_targets) install-pdo-headers http://cvs.php.net/diff.php/php-src/ext/pdo/config.m4?r1=1.9&r2=1.10&ty=u Index: php-src/ext/pdo/config.m4 diff -u php-src/ext/pdo/config.m4:1.9 php-src/ext/pdo/config.m4:1.10 --- php-src/ext/pdo/config.m4:1.9 Wed Feb 16 23:23:14 2005 +++ php-src/ext/pdo/config.m4 Thu Feb 17 20:39:36 2005 @@ -1,55 +1,29 @@ -dnl $Id: config.m4,v 1.9 2005/02/17 04:23:14 wez Exp $ +dnl $Id: config.m4,v 1.10 2005/02/18 01:39:36 wez Exp $ dnl config.m4 for extension pdo dnl vim:se ts=2 sw=2 et: -AC_ARG_WITH(broken-pear-install, -[],[ - if test "x$withval" = "xyes"; then - case $host_alias in - *darwin*) - AC_MSG_ERROR([ -Due to the way that loadable modules work on OSX/Darwin, you need to -compile the PDO package statically into the PHP core. - -Please follow the instructions at: http://netevil.org/node.php?nid=202 -for more detail on this issue. - ]) +pdo_running_under_pear=0 +case `pwd` in + /var/tmp/pear-build-*) + pdo_running_under_pear=1 ;; - *) - AC_MSG_ERROR([ -Due to a bug in the pear installer you should install the PDO package manually -using the following steps: - - 1. Download the PDO package to your local machine: - - % wget http://pecl.php.net/get/PDO - - 2. Determine your PHP bin dir. - If your php5 cli binary lives at /usr/local/php5/bin/php - the bin dir is /usr/local/php5/bin - - 3. Set your path so that your PHP bin dir is at the front: - export PATH="/usr/local/php5/bin:\$PATH" - - 4. Manually build: - - % tar xzf PDO-0.2.tgz - % cd PDO-0.2 - % phpize - % ./configure - % make - % sudo -s - # make install - # echo extension=pdo.so >> /usr/local/php5/lib/php.ini +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: + + % sudo pear upgrade pear -We apologize for the inconvenience, and hope to resolve this problem -in a future PHP/PEAR release. +or by manually downloading and installing PEAR version 1.3.5 or higher. +Once you've upgraded, please re-try your PDO install. ]) - ;; - esac fi -]) PHP_ARG_ENABLE(pdo, whether to enable PDO support, [ --enable-pdo=yes Enable PHP Data Objects support (recommended)], yes) @@ -58,6 +32,15 @@ if test "$ext_shared" = "yes" ; then case $host_alias in *darwin*) + if test "$pdo_running_under_pear" = "1"; then + AC_MSG_ERROR([ +Due to the way that loadable modules work on OSX/Darwin, you need to +compile the PDO package statically into the PHP core. + +Please follow the instructions at: http://netevil.org/node.php?nid=202 +for more detail on this issue. + ]) + fi ext_shared=no ;; esac http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.12&r2=1.13&ty=u Index: php-src/ext/pdo/package.xml diff -u php-src/ext/pdo/package.xml:1.12 php-src/ext/pdo/package.xml:1.13 --- php-src/ext/pdo/package.xml:1.12 Sun Feb 13 01:56:16 2005 +++ php-src/ext/pdo/package.xml Thu Feb 17 20:39:36 2005 @@ -30,12 +30,6 @@ </maintainer> </maintainers> -<!-- pear is still broken --> -<configureoptions> - <configureoption name="with-broken-pear-install" default="yes" prompt="the pear installer has a bug; press enter to find out more"/> -</configureoptions> - - <description> PDO provides a uniform data access interface, sporting advanced features such as prepared statements and bound parameters. PDO drivers are dynamically
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php