check_disk -C is more flexible now. See np-devel post (2007-02-10)

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index 5d1e75df29bb653597f064b3dac66ac836c28cb8..81033a031da01f823cb738ff1f7fcfca9bffa5a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION ($Revision$)
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.4.6)
+AC_INIT(nagios-plugins,1.4.7)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES(gl/Makefile)
 AC_CONFIG_AUX_DIR(build-aux)
@@ -15,13 +15,29 @@ AC_SUBST(RELEASE)
 AC_PREFIX_DEFAULT(/usr/local/nagios)
 
 dnl Deprecated configure options
-AC_ARG_WITH(nagios_user,,
-       AC_MSG_ERROR([--with-nagios-user is a deprecated option. Rerun ./configure without this option]))
-AC_ARG_WITH(nagios_group,,
-       AC_MSG_ERROR([--with-nagios-group is a deprecated option. Rerun ./configure without this option]))
 
-dnl Figure out how to invoke "install" and what install options to use.
-AC_PROG_INSTALL
+
+dnl Append user (-o), group (-g), mode (-m) to install command
+dnl There is an assumption that this is possible with ./configure's chosen install command
+extra_install_args=""
+AC_ARG_WITH(nagios_user,
+       ACX_HELP_STRING([--with-nagios-user=USER],
+               [Installs executables with this user. Defaults to install user]),
+       extra_install_args="-o $withval")
+AC_ARG_WITH(nagios_group,
+       ACX_HELP_STRING([--with-nagios-group=GROUP],
+               [Installs executables with this group. Defaults to install user]),
+       extra_install_args="$extra_install_args -g $withval")
+AC_ARG_WITH(world_permissions,
+       ACX_HELP_STRING([--without-world-permissions],
+               [Installs executables without world permissions]))
+
+if test "x$with_world_permissions" = xno ; then
+       extra_install_args="$extra_install_args -m 0550"
+fi
+
+INSTALL="$INSTALL $extra_install_args"
+INSTALL_STRIP_PROGRAM="$INSTALL_STRIP_PROGRAM $extra_install_args"
 AC_SUBST(INSTALL)
 
 AC_PROG_CC
@@ -242,23 +258,31 @@ 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
-    with_mysql=$MYSQLCONFIG
-    EXTRAS="$EXTRAS check_mysql check_mysql_query"
     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
 fi
 
-AC_CHECK_HEADERS(unistd.h)
-
 dnl Check for AF_INET6 support - unistd.h required for Darwin
 AC_CACHE_CHECK([for IPv6 support], with_ipv6, [
        AC_TRY_COMPILE([#ifdef HAVE_UNISTD_H
@@ -485,30 +509,16 @@ if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -
        ac_cv_ps_cols="$PS_COLS"
        AC_MSG_RESULT([(command-line) $ac_cv_ps_command])
 
-dnl Now using the pst3/kmem hack for solaris systems to avoid truncation
-elif test "$ac_cv_uname_s" = "SunOS"; then
-       #
-       # this is a very, very ugly hack, to hardcode the location for plugins
-       #
-       if test "$libexecdir" = '${exec_prefix}/libexec'; then
-               if test "$exec_prefix" = "NONE"; then
-                       if test "$prefix" = "NONE"; then
-                               pst3="$ac_default_prefix/libexec/pst3"
-                       else
-                               pst3="$prefix/libexec/pst3"
-                       fi
-               else
-                       pst3="$exec_prefix/libexec/pst3"
-               fi
-       else
-               pst3="$libexecdir/pst3"
-       fi
-       ac_cv_ps_command="$pst3"
-       ac_cv_ps_format="%s %d %d %d %d %f %s %n"
-       ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation
+dnl Limitation that command name is not available
+elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \
+       egrep -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null
+then
+       ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]"
+       ac_cv_ps_command="/usr/ucb/ps -alxwwn"
+       ac_cv_ps_format=["%*s %d %d %d %d %*d %*d %d %d%*[ 0123456789abcdef]%[OSRZT]%*s %*s %n"]
        ac_cv_ps_cols=8
-       AC_MSG_RESULT([using nagios-plugins internal ps for solaris])
-       EXTRAS_ROOT="$EXTRAS_ROOT pst3"
+       AC_MSG_RESULT([$ac_cv_ps_command])
 
 dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
 dnl so test for this first...