X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fm4%2Fmysql.m4;h=5775f0d3173bd941231f5b68214f1c37da7f316c;hb=bd8a989e9f0d0c115ae771732c9199589e3043fd;hp=2edd3b869c0f80c3c620122e8d4e9d73e000a620;hpb=1a09bec1c62a5068126735cc0915020bf487f4b1;p=awesomized%2Flibmemcached diff --git a/libtest/m4/mysql.m4 b/libtest/m4/mysql.m4 index 2edd3b86..5775f0d3 100644 --- a/libtest/m4/mysql.m4 +++ b/libtest/m4/mysql.m4 @@ -1,23 +1,24 @@ m4_include([libtest/m4/ax_lib_mysql.m4]) m4_include([libtest/m4/ax_prog_mysqld.m4]) -AX_LIB_MYSQL([5.0]) -AM_CONDITIONAL(HAVE_LIBMYSQL, test "x${found_mysql}" = "xyes") -AS_IF([test "x${found_mysql}" = "xyes"], - [ - AC_DEFINE([HAVE_LIBMYSQL_BUILD], [1], [Define to 1 if MySQL libraries are available]) - ], - [ - AC_DEFINE([HAVE_LIBMYSQL_BUILD], [0], [Define to 1 if MySQL libraries are available]) - ]) -AX_PROG_MYSQLD -AS_IF([test -f "$ac_cv_path_MYSQLD"], - [ +#serial 1 + + AC_DEFUN([YATL_MYSQL], [ + AC_REQUIRE([AX_PROG_MYSQLD]) + + AX_LIB_MYSQL([5.0]) + AM_CONDITIONAL(HAVE_LIBMYSQL, test "x${found_mysql}" = "xyes") + AS_IF([test "x${found_mysql}" = "xyes"],[ + AC_DEFINE([HAVE_LIBMYSQL_BUILD], [1], [Define to 1 if MySQL libraries are available]) + ],[ + AC_DEFINE([HAVE_LIBMYSQL_BUILD], [0], [Define to 1 if MySQL libraries are available]) + ]) + + AS_IF([test -f "$ac_cv_path_MYSQLD"],[ AC_DEFINE([HAVE_MYSQLD_BUILD], [1], [Define to 1 if MySQLD binary is available]) AC_DEFINE_UNQUOTED([MYSQLD_BINARY], "$ac_cv_path_MYSQLD", [Name of the mysqld binary used in make test]) - ], - [ + ],[ AC_DEFINE([HAVE_MYSQLD_BUILD], [0], [Define to 1 if MySQLD binary is available]) AC_DEFINE([MYSQLD_BINARY], [0], [Name of the mysqld binary used in make test]) + ]) ]) -