Better include path detection.

diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 205a9091b8941b772df2bd68f962240169219e19..14fa4ffa6ec03f8b0bef4f6ca5cccfde66633aa3 100755 (executable)
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -19,19 +19,15 @@ if test "$PHP_PDO_MYSQL" != "no"; then
   AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
 
   for i in $PHP_PDO_MYSQL /usr/local /usr; do
-    if test -x $i/bin/mysql_config; then
       MYSQL_DIR=$i
       PDO_MYSQL_CONFIG=$MYSQL_DIR/bin/mysql_config
-      MYSQL_INC_DIR=$i/include/mysql
+      if test -r $i/include/mysql; then
+       MYSQL_INC_DIR=$i/include/mysql
+      else
+       MYSQL_INC_DIR=$i/include
+      fi      
       MYSQL_LIBS=$i/lib
       break
-    elif test -x $i/bin/mysql_config; then
-      MYSQL_DIR=$i
-      PDO_MYSQL_CONFIG=$MYSQL_DIR/bin/mysql_config
-      MYSQL_INC_DIR=$i/include
-      MYSQL_LIBS=$i/lib
-      break
-    fi
   done
 
   if test -z "$MYSQL_DIR"; then