HAYASHI Kentaro
null+****@clear*****
Wed Nov 27 10:13:01 JST 2013
HAYASHI Kentaro 2013-11-27 10:13:01 +0900 (Wed, 27 Nov 2013) New Revision: fadbf1223e314c35f0dd6ef1f63d332458690bdb https://github.com/mroonga/mroonga/commit/fadbf1223e314c35f0dd6ef1f63d332458690bdb Message: Indent Modified files: configure.ac Modified: configure.ac (+23 -23) =================================================================== --- configure.ac 2013-11-27 10:10:53 +0900 (20ea86b) +++ configure.ac 2013-11-27 10:13:01 +0900 (4bdf715) @@ -188,31 +188,31 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ AC_SUBST(MYSQL_VERSION) if test "${with_libmysqlservices_compat}" = "no"; then - MYSQL_MAJOR_MINOR_VERSION=["$(echo $MYSQL_VERSION | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*[a-z]*\)$/\1.\2/')"] - case "$MYSQL_MAJOR_MINOR_VERSION" in - 5.1) - MYSQL_LIBS="" - ;; - *) - AC_MSG_CHECKING([for libmysqlservices.a directory]) - pkglibdir="$($ac_mysql_config --variable=pkglibdir)" - mysql_build_libservices_dir="${MYSQL_BUILD_DIR}/libservices" - if test -f "${mysql_build_libservices_dir}/libmysqlservices.a"; then - mysql_services_lib_dir="${mysql_build_libservices_dir}" - else - if test -f "${pkglibdir}/libmysqlservices.a"; then - mysql_services_lib_dir="${pkglibdir}" - elif test -f "${pkglibdir}/mysql/libmysqlservices.a"; then - mysql_services_lib_dir="${pkglibdir}/mysql" + MYSQL_MAJOR_MINOR_VERSION=["$(echo $MYSQL_VERSION | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*[a-z]*\)$/\1.\2/')"] + case "$MYSQL_MAJOR_MINOR_VERSION" in + 5.1) + MYSQL_LIBS="" + ;; + *) + AC_MSG_CHECKING([for libmysqlservices.a directory]) + pkglibdir="$($ac_mysql_config --variable=pkglibdir)" + mysql_build_libservices_dir="${MYSQL_BUILD_DIR}/libservices" + if test -f "${mysql_build_libservices_dir}/libmysqlservices.a"; then + mysql_services_lib_dir="${mysql_build_libservices_dir}" else - AC_MSG_ERROR([libmysqlservices.a is not found in <${pkglibdir}/> and <${pkglibdir}/mysql/>]) + if test -f "${pkglibdir}/libmysqlservices.a"; then + mysql_services_lib_dir="${pkglibdir}" + elif test -f "${pkglibdir}/mysql/libmysqlservices.a"; then + mysql_services_lib_dir="${pkglibdir}/mysql" + else + AC_MSG_ERROR([libmysqlservices.a is not found in <${pkglibdir}/> and <${pkglibdir}/mysql/>]) + fi fi - fi - AC_MSG_RESULT([$mysql_services_lib_dir]) - MYSQL_LIBS="$MYSQL_LIBS -L\"$mysql_services_lib_dir\" -lmysqlservices" - ;; - esac - AC_SUBST(MYSQL_LIBS) + AC_MSG_RESULT([$mysql_services_lib_dir]) + MYSQL_LIBS="$MYSQL_LIBS -L\"$mysql_services_lib_dir\" -lmysqlservices" + ;; + esac + AC_SUBST(MYSQL_LIBS) fi ]) -------------- next part -------------- HTML����������������������������...Download