From b3b735446741fe89ee837d0522dd0d5b68167d92 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Tue, 21 Mar 2006 11:42:59 +0000 Subject: mysql discovery based on mysql_config (Johan Fischer - 1359414) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1333 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/Makefile.am | 2 ++ plugins/tests/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 9a1f6d09..dc01ff2d 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -63,8 +63,10 @@ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS) check_load_LDADD = $(BASEOBJS) popen.o check_mrtg_LDADD = $(BASEOBJS) check_mrtgtraf_LDADD = $(BASEOBJS) +check_mysql_CFLAGS = $(MYSQLCFLAGS) check_mysql_CPPFLAGS = $(MYSQLINCLUDE) check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS) +check_mysql_query_CFLAGS = $(MYSQLCFLAGS) check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE) check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS) check_nagios_LDADD = $(BASEOBJS) runcmd.o diff --git a/plugins/tests/Makefile.am b/plugins/tests/Makefile.am index d3e74945..8ed3fc1d 100644 --- a/plugins/tests/Makefile.am +++ b/plugins/tests/Makefile.am @@ -15,7 +15,7 @@ LIBS = @LIBINTL@ test_utils_SOURCES = test_utils.c test_utils_CFLAGS = -g -I.. -test_utils_LDFLAGS = -rpath /usr/local/lib -ltap +test_utils_LDFLAGS = -L/usr/local/lib -ltap test_utils_LDADD = ../utils.o test: ${noinst_PROGRAMS} -- cgit v1.2.3-74-g34f1