diff options
Diffstat (limited to 'nagiosplug_mariadbclient.patch')
-rw-r--r-- | nagiosplug_mariadbclient.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/nagiosplug_mariadbclient.patch b/nagiosplug_mariadbclient.patch deleted file mode 100644 index 5248756..0000000 --- a/nagiosplug_mariadbclient.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4 | ||
2 | index c2a4d2a7..5099a02b 100644 | ||
3 | --- a/m4/np_mysqlclient.m4 | ||
4 | +++ b/m4/np_mysqlclient.m4 | ||
5 | @@ -53,18 +53,34 @@ AC_DEFUN([np_mysqlclient], | ||
6 | _savedcppflags="$CPPFLAGS" | ||
7 | CPPFLAGS="$CPPFLAGS $np_mysql_include" | ||
8 | |||
9 | - dnl Putting $np_mysql_libs as other libraries ensures that all mysql dependencies are linked in | ||
10 | - dnl Although -lmysqlclient is duplicated, it is not a problem | ||
11 | - AC_CHECK_LIB([mysqlclient], [mysql_init], [ | ||
12 | - with_mysql=$np_mysql_config | ||
13 | - AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mysqlclient is found and can compile]) | ||
14 | - ], [with_mysql=no], [$np_mysql_libs]) | ||
15 | + np_check_lib_mysqlclient | ||
16 | + | ||
17 | CPPFLAGS=$_savedcppflags | ||
18 | |||
19 | fi | ||
20 | fi | ||
21 | ]) | ||
22 | |||
23 | +dnl Test mysql_init using mysqlclient | ||
24 | +AC_DEFUN([np_check_lib_mysqlclient], | ||
25 | +[ | ||
26 | + dnl Putting $np_mysql_libs as other libraries ensures that all mysql dependencies are linked in | ||
27 | + dnl Although -lmysqlclient is duplicated, it is not a problem | ||
28 | + AC_CHECK_LIB([mysqlclient], [mysql_init], [ | ||
29 | + with_mysql=$np_mysql_config | ||
30 | + AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mysqlclient is found and can compile]) | ||
31 | + ], [np_check_lib_mariadbclient], [$np_mysql_libs]) | ||
32 | +]) | ||
33 | + | ||
34 | +dnl Test mysql_init using mariadbclient | ||
35 | +AC_DEFUN([np_check_lib_mariadbclient], | ||
36 | +[ | ||
37 | + AC_CHECK_LIB([mariadbclient], [mysql_init], [ | ||
38 | + with_mysql=$np_mysql_config | ||
39 | + AC_DEFINE(HAVE_MYSQLCLIENT, 1, [Defined if mariadbclient is found and can compile]) | ||
40 | + ], [with_mysql=no], [$np_mysql_libs]) | ||
41 | +]) | ||
42 | + | ||
43 | dnl Will take $1, find last occurrance of -LDIR and add DIR to LD_RUN_PATH | ||
44 | AC_DEFUN([np_add_to_runpath], | ||
45 | [ | ||