diff options
| author |  Ton Voon <tonvoon@mac.com>
| 2019-08-02 15:33:07 +0000 |
|---|---|---|
| committer |  Sven Nierlein <sven@nierlein.org>
| 2019-08-12 10:40:42 +0200 |
| commit | 1de8c41b6c703a6cea8f4a1fc6e9b5d97456272a (patch) | |
| tree | dceaa50951afa0f2e28bf3d85a861962047dca02 | |
| parent | e8325b39c47e6fbf7c8c1e31f9026870d9520af5 (diff) | |
| download | monitoring-plugins-1de8c41b6c703a6cea8f4a1fc6e9b5d97456272a.tar.gz | |
Allow mariadbclient to be used for check_mysql
| -rw-r--r-- | m4/np_mysqlclient.m4 | 28 | ||||
| -rw-r--r-- | nagiosplug_mariadbclient.patch | 45 |
2 files changed, 67 insertions, 6 deletions
diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4 index c2a4d2a7..5099a02b 100644 --- a/m4/np_mysqlclient.m4 +++ b/m4/np_mysqlclient.m4 @@ -53,18 +53,34 @@ AC_DEFUN([np_mysqlclient], _savedcppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $np_mysql_include" - dnl Putting $np_mysql_libs as other libraries ensures that all mysql dependencies are linked in - dnl Although -lmysqlclient is duplicated, it is not a problem - AC_CHECK_LIB([mysqlclient], [mysql_init], [ - with_mysql=$np_mysql_config - AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mysqlclient is found and can compile]) - ], [with_mysql=no], [$np_mysql_libs]) + np_check_lib_mysqlclient + CPPFLAGS=$_savedcppflags fi fi ]) +dnl Test mysql_init using mysqlclient +AC_DEFUN([np_check_lib_mysqlclient], +[ + dnl Putting $np_mysql_libs as other libraries ensures that all mysql dependencies are linked in + dnl Although -lmysqlclient is duplicated, it is not a problem + AC_CHECK_LIB([mysqlclient], [mysql_init], [ + with_mysql=$np_mysql_config + AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mysqlclient is found and can compile]) + ], [np_check_lib_mariadbclient], [$np_mysql_libs]) +]) + +dnl Test mysql_init using mariadbclient +AC_DEFUN([np_check_lib_mariadbclient], +[ + AC_CHECK_LIB([mariadbclient], [mysql_init], [ + with_mysql=$np_mysql_config + AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mariadbclient is found and can compile]) + ], [with_mysql=no], [$np_mysql_libs]) +]) + dnl Will take $1, find last occurrance of -LDIR and add DIR to LD_RUN_PATH AC_DEFUN([np_add_to_runpath], [ diff --git a/nagiosplug_mariadbclient.patch b/nagiosplug_mariadbclient.patch new file mode 100644 index 00000000..52487563 --- /dev/null +++ b/nagiosplug_mariadbclient.patch @@ -0,0 +1,45 @@ +diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4 +index c2a4d2a7..5099a02b 100644 +--- a/m4/np_mysqlclient.m4 ++++ b/m4/np_mysqlclient.m4 +@@ -53,18 +53,34 @@ AC_DEFUN([np_mysqlclient], + _savedcppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $np_mysql_include" + +- dnl Putting $np_mysql_libs as other libraries ensures that all mysql dependencies are linked in +- dnl Although -lmysqlclient is duplicated, it is not a problem +- AC_CHECK_LIB([mysqlclient], [mysql_init], [ +- with_mysql=$np_mysql_config +- AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mysqlclient is found and can compile]) +- ], [with_mysql=no], [$np_mysql_libs]) ++ np_check_lib_mysqlclient ++ + CPPFLAGS=$_savedcppflags + + fi + fi + ]) + ++dnl Test mysql_init using mysqlclient ++AC_DEFUN([np_check_lib_mysqlclient], ++[ ++ dnl Putting $np_mysql_libs as other libraries ensures that all mysql dependencies are linked in ++ dnl Although -lmysqlclient is duplicated, it is not a problem ++ AC_CHECK_LIB([mysqlclient], [mysql_init], [ ++ with_mysql=$np_mysql_config ++ AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mysqlclient is found and can compile]) ++ ], [np_check_lib_mariadbclient], [$np_mysql_libs]) ++]) ++ ++dnl Test mysql_init using mariadbclient ++AC_DEFUN([np_check_lib_mariadbclient], ++[ ++ AC_CHECK_LIB([mariadbclient], [mysql_init], [ ++ with_mysql=$np_mysql_config ++ AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mariadbclient is found and can compile]) ++ ], [with_mysql=no], [$np_mysql_libs]) ++]) ++ + dnl Will take $1, find last occurrance of -LDIR and add DIR to LD_RUN_PATH + AC_DEFUN([np_add_to_runpath], + [ |