diff options
| author | Terry Droeger <terry.droeger@gmail.com> | 2018-03-18 00:04:58 -0500 |
|---|---|---|
| committer | Terry Droeger <terry.droeger@gmail.com> | 2018-03-18 00:04:58 -0500 |
| commit | 518b74bcb640aedadf4514e581b85b92c88977d6 (patch) | |
| tree | 8039eacaa1072f734248f6ba465e258c6940eae4 /m4/ax_check_mysql.m4 | |
| parent | 02b6d1a6ef2abf3a050a8e85e5bacf667d6da37f (diff) | |
| download | autoconf-archive-518b74bcb640aedadf4514e581b85b92c88977d6.tar.gz | |
fix header file path and version check conditional
Diffstat (limited to 'm4/ax_check_mysql.m4')
| -rw-r--r-- | m4/ax_check_mysql.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/ax_check_mysql.m4 b/m4/ax_check_mysql.m4 index a4b81e3..bb665aa 100644 --- a/m4/ax_check_mysql.m4 +++ b/m4/ax_check_mysql.m4 @@ -118,9 +118,9 @@ AC_DEFUN([AX_CHECK_MYSQL_INSTALL],[ ROOT_DIR="$1" # Check for include directory - AX_CHECK_MYSQL_INCLUDES([$ROOT_DIR/include/mysql/mysql_version.h]) + AX_CHECK_MYSQL_INCLUDES([$ROOT_DIR/include/mysql]) if test "$MYSQL_INCLUDES" == "no" ; then - AX_CHECK_MYSQL_INCLUDES([$ROOT_DIR/include/mysql_version.h]) + AX_CHECK_MYSQL_INCLUDES([$ROOT_DIR/include]) fi mysql_include_test=$MYSQL_INCLUDES @@ -358,7 +358,7 @@ AC_DEFUN([AX_CHECK_MYSQL],[ if test "$CHECKER_MAJOR" != "" && test "$CHECKER_MINOR" != "" && test "$CHECKER_REV" == "" then AC_MSG_CHECKING([if MySQL version is equal or greater than $MINIMUM_V]) - if test "$MYSQL_MAJOR_V" -lt "$MINIMUM_MAJOR_V" || (test "$MYSQL_MAJOR_V" -eq "$MINIMUM_MAJOR_V" && test "$MYSQL_MINOR_V" -lt "$MINIMUM_MINOR_V") || (test "$MYSQL_MAJOR_V" -eq "$MINIMUM_MAJOR_V" && test "$MYSQL_MINOR_V" -eq "$MINIMUM_MINOR_V" && "$MYSQL_REV_V" -lt "MINIMUM_REV_V") + if test "$MYSQL_MAJOR_V" -lt "$MINIMUM_MAJOR_V" || (test "$MYSQL_MAJOR_V" -eq "$MINIMUM_MAJOR_V" && test "$MYSQL_MINOR_V" -lt "$MINIMUM_MINOR_V") || (test "$MYSQL_MAJOR_V" -eq "$MINIMUM_MAJOR_V" && test "$MYSQL_MINOR_V" -eq "$MINIMUM_MINOR_V" && test "$MYSQL_REV_V" -lt "$MINIMUM_REV_V") then AC_SUBST(MYSQL_PLUGIN_OK,no) AC_MSG_RESULT([no]) |