bzr commit into mysql-5.5 branch (jonathan.perkin:3092)

[Jonathan Perkin]

#At file:///Users/jperkin/bzr-mysql/mysql-5.5-incfix/ based on revid:jonathan.perkin@stripped

 3092 Jonathan Perkin	2010-12-17
      Perform an actual test for the location of mysql.h else we trip up
      because include/mysql exists but isn't the root of the includes.

    modified:
      scripts/mysql_config.sh
=== modified file 'scripts/mysql_config.sh'
--- a/scripts/mysql_config.sh	2010-08-09 13:27:04 +0000
+++ b/scripts/mysql_config.sh	2010-12-17 13:34:04 +0000
@@ -92,7 +92,11 @@ plugindir_rel=`echo $plugindir | sed -e 
 fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
 
 pkgincludedir='@pkgincludedir@'
-fix_path pkgincludedir include/mysql include
+if [ -f include/mysql/mysql.h ]; then
+  pkgincludedir='include/mysql'
+elif [ -f include/mysql.h ]; then
+  pkgincludedir='include'
+fi
 
 version='@VERSION@'
 socket='@MYSQL_UNIX_ADDR@'


Attachment: [text/bzr-bundle] bzr/[e-mail]