summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-10-17 18:26:27 +0200
committerJohannes Schlüter <johannes@php.net>2012-10-17 18:26:27 +0200
commit82fb5df380c726ab919355caf46c54207d0f1253 (patch)
tree883719418b7b65336f7d3657dc4f40112d010e7a
parent7aa3d0ae658d3eb386915311929c48ba300b8493 (diff)
parent3899adb46feb7a2dbd8f976ee02218b994c9f9ad (diff)
downloadphp-git-82fb5df380c726ab919355caf46c54207d0f1253.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
-rw-r--r--ext/mysql/config.m47
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index fa7a46f853..5968c43346 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -97,6 +97,13 @@ Note that the MySQL client library is not bundled anymore!])
done
if test -z "$MYSQL_LIB_DIR"; then
+ MYSQL_LIB_CHK(lib/x86_64-linux-gnu)
+ fi
+ if test -z "$MYSQL_LIB_DIR"; then
+ MYSQL_LIB_CHK(lib/i386-linux-gnu)
+ fi
+
+ if test -z "$MYSQL_LIB_DIR"; then
AC_MSG_ERROR([Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
Note that the MySQL client library is not bundled anymore!])
fi