[Nagiosplug-checkins] nagiosplug/plugins Makefile.am,1.63,1.64 check_mysql.c,1.29,1.30 check_mysql_query.c,1.1,1.2

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14766/plugins

Modified Files:
	Makefile.am check_mysql.c check_mysql_query.c 
Log Message:
mysql detection cleanup: fixes runtime linking, autodetection of main
locations, detection of lib64 and different layouts


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- Makefile.am	31 Jan 2006 16:45:29 -0000	1.63
+++ Makefile.am	17 Mar 2006 14:07:34 -0000	1.64
@@ -63,7 +63,9 @@
 check_load_LDADD = $(BASEOBJS) popen.o
 check_mrtg_LDADD = $(BASEOBJS)
 check_mrtgtraf_LDADD = $(BASEOBJS)
+check_mysql_CPPFLAGS = $(MYSQLINCLUDE)
 check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
+check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE)
 check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
 check_nagios_LDADD = $(BASEOBJS) runcmd.o
 check_nt_LDADD = $(NETLIBS) 

Index: check_mysql_query.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mysql_query.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- check_mysql_query.c	31 Jan 2006 14:52:48 -0000	1.1
+++ check_mysql_query.c	17 Mar 2006 14:07:34 -0000	1.2
@@ -22,8 +22,8 @@
 #include "utils.h"
 #include "netutils.h"
 
-#include <mysql/mysql.h>
-#include <mysql/errmsg.h>
+#include <mysql.h>
+#include <errmsg.h>
 
 char *db_user = NULL;
 char *db_host = NULL;

Index: check_mysql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mysql.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- check_mysql.c	15 Mar 2006 19:54:32 -0000	1.29
+++ check_mysql.c	17 Mar 2006 14:07:34 -0000	1.30
@@ -25,8 +25,8 @@
 #include "utils.h"
 #include "netutils.h"
 
-#include <mysql/mysql.h>
-#include <mysql/errmsg.h>
+#include <mysql.h>
+#include <errmsg.h>
 
 char *db_user = NULL;
 char *db_host = NULL;