[Nagiosplug-checkins] nagiosplug NEWS, 1.17, 1.18 configure.in, 1.211, 1.212

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28142

Modified Files:
	NEWS configure.in 
Log Message:
Fix AC_CHECK_LIB for mysql_init - add dependent libraries. mysql detection 
separated into external m4 file


Index: NEWS
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/NEWS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- NEWS	29 Mar 2007 10:32:01 -0000	1.17
+++ NEWS	30 Mar 2007 14:08:26 -0000	1.18
@@ -1,5 +1,11 @@
 This file documents the major additions and syntax changes between releases.
 
+1.4.8 ??
+	Respects --without-world-permissions for setuid plugins
+	check_disk extra options for regex matching of filesystems and grouping of filesystems
+	for collective thresholds
+	Better configure test for mysqlclient availability
+
 1.4.7 29th March 2007
 	check_procs uses /usr/ucb/ps if available - fixes pst3 problems on Solaris
 	Fixed MKINSTALLDIRS problem in po/

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- configure.in	29 Mar 2007 10:32:01 -0000	1.211
+++ configure.in	30 Mar 2007 14:08:26 -0000	1.212
@@ -241,46 +241,18 @@
 LIBS="$_SAVEDLIBS"
 
 dnl Check for mysql libraries
-dnl Default is to search path for mysql_config
-AC_ARG_WITH(mysql,
-	ACX_HELP_STRING([--with-mysql=DIR],
-		[Compiles mysql plugins. Expects DIR/bin/mysql_config]),
-	with_mysql=$withval,
-	with_mysql=yes)
-if test $with_mysql != "no" ; then
-  if test -x $with_mysql/bin/mysql_config ; then
-    MYSQLCONFIG="$with_mysql/bin/mysql_config"
-  else
-    AC_PATH_PROG(MYSQLCONFIG, mysql_config)
-  fi
-  if test -z "$MYSQLCONFIG"; then
-    with_mysql="not found"
-    AC_MSG_WARN([Skipping mysql plugin])
-    AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
-  else
-    MYSQLINCLUDE=`$MYSQLCONFIG --include`
-    # Mysql 3 does not support --include. --cflags should be sufficient
-    if test $? -ne 0 ; then
-      MYSQLINCLUDE=""
-      TEMP_INCLUDE="-I$with_mysql/include"	# Guessed location
-    else
-      TEMP_INCLUDE=$MYSQLINCLUDE
-    fi
-    MYSQLLIBS=`$MYSQLCONFIG --libs`
-    MYSQLCFLAGS=`$MYSQLCONFIG --cflags`
-    AC_SUBST(MYSQLINCLUDE)
-    AC_SUBST(MYSQLLIBS)
-    AC_SUBST(MYSQLCFLAGS)
-    dnl Test for mysqlclient. Some redhat systems have mysql_config, but no headers
-    _SAVEDCPPFLAGS=$CPPFLAGS
-    _SAVEDLDFLAGS="$LDFLAGS"
-    CPPFLAGS="$CPPFLAGS $TEMP_INCLUDE"
-    LDFLAGS="$LDFLAGS $MYSQLLIBS"
-    AC_CHECK_LIB([mysqlclient], [mysql_init], [with_mysql=$MYSQLCONFIG
-EXTRAS="$EXTRA check_mysql check_mysql_query"], [with_mysql="not found"])
-    CPPFLAGS=$_SAVEDCPPFLAGS
-    LDFLAGS=$_SAVEDLDFLAGS
-  fi
+np_mysqlclient
+if test $with_mysql = "no" ; then
+  AC_MSG_WARN([Skipping mysql plugin])
+  AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
+else
+  EXTRAS="$EXTRA check_mysql check_mysql_query"
+  MYSQLINCLUDE="$np_mysql_include"
+  MYSQLLIBS="$np_mysql_libs"
+  MYSQLCFLAGS="$np_mysql_cflags"
+  AC_SUBST(MYSQLINCLUDE)
+  AC_SUBST(MYSQLLIBS)
+  AC_SUBST(MYSQLCFLAGS)
 fi
 
 dnl Check for AF_INET6 support - unistd.h required for Darwin