diff options
| author | foobar <sniper@php.net> | 2005-06-07 12:39:02 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-06-07 12:39:02 +0000 |
| commit | bf9471683883ea38a50b2b96208ef21802905ba2 (patch) | |
| tree | 2274341949a2813cc0672542574480466aa0f2ce | |
| parent | 4658513d70279f940c7c3d2b54612ad4549e1fa5 (diff) | |
| download | php-git-bf9471683883ea38a50b2b96208ef21802905ba2.tar.gz | |
- Allow doing --with-mysql --with-mysqli (no mysql libs are bundled atm)
- Make sure MYSQL_DIR is empty.
| -rw-r--r-- | ext/mysql/config.m4 | 3 | ||||
| -rw-r--r-- | ext/mysqli/config.m4 | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index e6815aa0fb..352729d821 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -66,6 +66,9 @@ if test "$PHP_MYSQL" != "no"; then AC_MSG_RESULT([no]) fi + MYSQL_DIR= + MYSQL_INC_DIR= + for i in $PHP_MYSQL /usr/local /usr; do if test -r $i/include/mysql/mysql.h; then MYSQL_DIR=$i diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 index f22d198d3a..e0c3d5ead3 100644 --- a/ext/mysqli/config.m4 +++ b/ext/mysqli/config.m4 @@ -11,9 +11,10 @@ PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, if test "$PHP_MYSQLI" != "no"; then - if test "$PHP_MYSQL" = "yes"; then - AC_MSG_ERROR([--with-mysql (using bundled libs) can not be used together with --with-mysqli.]) - fi +dnl there are no mysql libs currently bundled with PHP.. --Jani +dnl if test "$PHP_MYSQL" = "yes"; then +dnl AC_MSG_ERROR([--with-mysql (using bundled libs) can not be used together with --with-mysqli.]) +dnl fi if test "$PHP_MYSQLI" = "yes"; then MYSQL_CONFIG=`$php_shtool path mysql_config` |