From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 19 May 2004 16:26:06 +0000 (+0000)
Subject: Better include path detection.
X-Git-Tag: RELEASE_0_1~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5a908c4bf8e345e32d8ce65bc0345fcab0bec5a;p=php

Better include path detection.
---

diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 205a9091b8..14fa4ffa6e 100755
--- 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