cvs: pear /CodeGen_MySQL/data mysql.m4

hholzgra Thu Jun 15 20:48:12 2006 UTC Modified files: /pear/CodeGen_MySQL/data mysql.m4 Log: - MYSQL_USE_CLIENT_API fixed - plugin directory detection added (requires running server) http://cvs.php.net/viewcvs.cgi/pear/CodeGen_MySQL/data/mysql.m4?r1=1.7&r2=1.8&diff_format=u Index: pear/CodeGen_MySQL/data/mysql.m4 diff -u pear/CodeGen_MySQL/data/mysql.m4:1.7 pear/CodeGen_MySQL/data/mysql.m4:1.8 --- pear/CodeGen_MySQL/data/mysql.m4:1.7 Fri Jun 2 21:14:02 2006 +++ pear/CodeGen_MySQL/data/mysql.m4 Thu Jun 15 20:48:12 2006 @@ -74,6 +74,8 @@ MYSQL_CONFIG_INCLUDE=$MYSQL_CONFIG --include MYSQL_CONFIG_LIBS_R=$MYSQL_CONFIG --libs_r + MYSQL_CLIENT=dirname $MYSQL_CONFIG/mysql + AC_MSG_RESULT($MYSQL_CONFIG) fi fi @@ -142,6 +144,7 @@ AC_SUBST([MYSQL_LDFLAGS]) AC_SUBST([MYSQL_LIBS]) AC_SUBST([MYSQL_VERSION]) + AC_SUBST([MYSQL_PLUGIN_DIR]) ]) @@ -254,8 +257,10 @@ dnl MYSQL_USE_NDB_API() dnl AC_DEFUN([MYSQL_USE_NDB_API], [ - MYSQL_USE_API(); + MYSQL_USE_CLIENT_API() + AC_PROG_CXX MYSQL_CHECK_VERSION([5.0.0],[ + # mysql_config results need some post processing for now # the include pathes changed in 5.1.x due @@ -327,6 +332,8 @@ MYSQL_CFLAGS="$MYSQL_CFLAGS $ADDFLAGS -DMYSQL_DYNAMIC_PLUGIN" MYSQL_CXXFLAGS="$MYSQL_CXXFLAGS $ADDFLAGS" + + MYSQL_PLUGIN_DIR=$MYSQL_CLIENT -BNe "show variables like 'plugin_dir'" | sed -e "s/^plugin_dir\t//g" ])