[Nagiosplug-checkins] CVS: nagiosplug Makefile.am,1.4,1.5 acconfig.h,1.5,1.6 configure.in,1.24,1.25 nagios-plugins.spec.in,1.4,1.5

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug
In directory usw-pr-cvs1:/tmp/cvs-serv22013

Modified Files:
	Makefile.am acconfig.h configure.in nagios-plugins.spec.in 
Log Message:
fix bug with gettimeofday test, improve version/release handling, update rpm spec

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.am	25 Oct 2002 02:31:02 -0000	1.4
--- Makefile.am	14 Nov 2002 18:25:08 -0000	1.5
***************
*** 7,11 ****
  
  dist-hook:
! 	sed "s/PACKAGE_VERSION/@PACKAGE_VERSION@/;s/PACKAGE_RELEASE/@PACKAGE_RELEASE@/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec
  
  test:
--- 7,11 ----
  
  dist-hook:
! 	sed "s/%%{VER}/@VER@/;s/%%{REL}/@REL@/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec
  
  test:

Index: acconfig.h
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/acconfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acconfig.h	8 Nov 2002 07:20:05 -0000	1.5
--- acconfig.h	14 Nov 2002 18:25:08 -0000	1.6
***************
*** 16,19 ****
--- 16,20 ----
  #undef HAVE_VASPRINTF
  #undef HAVE_VSNPRINTF
+ #undef NEED_GETTIMEOFDAY
  #undef NSLOOKUP_COMMAND
  #undef HOST_COMMAND

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** configure.in	14 Nov 2002 04:00:34 -0000	1.24
--- configure.in	14 Nov 2002 18:25:09 -0000	1.25
***************
*** 4,12 ****
  AC_REVISION ($Revision$)
  AC_INIT(Helper.pm)
! PACKAGE_VERSION="1.3.0"
  AC_SUBST(PACKAGE_VERSION)
  PACKAGE_RELEASE="alpha1"
  AC_SUBST(PACKAGE_RELEASE)
! AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION}-${PACKAGE_RELEASE})
  AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
  
--- 4,16 ----
  AC_REVISION ($Revision$)
  AC_INIT(Helper.pm)
! VER=1.3.0
! REL=beta2
! AC_SUBST(VER)
! AC_SUBST(REL)
! PACKAGE_VERSION="${VER}-${REL}"
  AC_SUBST(PACKAGE_VERSION)
  PACKAGE_RELEASE="alpha1"
  AC_SUBST(PACKAGE_RELEASE)
! AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
  AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
  
***************
*** 367,376 ****
  
  AC_TRY_COMPILE([#include <sys/time.h>],
!                [struct timeval *foo;],
!                [AC_DEFINE(HAVE_STRUCT_TIMEVAL,1,[Define if we have a timeval structure])])
! 
! AC_TRY_COMPILE([#include <sys/time.h>],
!                [gettimeofday(NULL, NULL);],
!                AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define if gettimeofday is found]))
  
  dnl Checks for library functions.
--- 371,383 ----
  
  AC_TRY_COMPILE([#include <sys/time.h>],
!                [struct timeval *tv;
!                 struct timezone *tz;],
!                AC_DEFINE(HAVE_STRUCT_TIMEVAL,1,[Define if we have a timeval structure])
!                AC_TRY_COMPILE([#include <sys/time.h>],
!                               [struct timeval *tv;
!                                struct timezone *tz;
!                                gettimeofday(tv, tz);],
!                               AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define if gettimeofday is found]),
!                               AC_DEFINE(NEED_GETTIMEOFDAY,1,[Define if gettimeofday is needed])))
  
  dnl Checks for library functions.

Index: nagios-plugins.spec.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/nagios-plugins.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** nagios-plugins.spec.in	26 Oct 2002 13:30:10 -0000	1.4
--- nagios-plugins.spec.in	14 Nov 2002 18:25:09 -0000	1.5
***************
*** 9,14 ****
  %endif
  
! %define version PACKAGE_VERSION
! %define release PACKAGE_RELEASE
  %define source %{archive}-%{version}
  
--- 9,14 ----
  %endif
  
! %define version %%{VER}
! %define release %%{REL}
  %define source %{archive}-%{version}
  
***************
*** 96,99 ****
--- 96,100 ----
  %{_prefix}/lib/nagios/plugins/check_by_ssh
  %{_prefix}/lib/nagios/plugins/check_breeze
+ %{_prefix}/lib/nagios/plugins/check_dig
  %{_prefix}/lib/nagios/plugins/check_disk
  %{_prefix}/lib/nagios/plugins/check_disk_smb
***************
*** 103,110 ****
--- 104,114 ----
  %{_prefix}/lib/nagios/plugins/check_ftp
  %{_prefix}/lib/nagios/plugins/check_http
+ %{_prefix}/lib/nagios/plugins/check_ifoperstatus
+ %{_prefix}/lib/nagios/plugins/check_ifstatus
  %{_prefix}/lib/nagios/plugins/check_imap
  %{_prefix}/lib/nagios/plugins/check_ircd
  %{_prefix}/lib/nagios/plugins/check_load
  %{_prefix}/lib/nagios/plugins/check_log
+ %{_prefix}/lib/nagios/plugins/check_mailq
  %{_prefix}/lib/nagios/plugins/check_mrtg
  %{_prefix}/lib/nagios/plugins/check_mrtgtraf
***************
*** 131,134 ****
--- 135,139 ----
  %{_prefix}/lib/nagios/plugins/check_vsz
  %{_prefix}/lib/nagios/plugins/check_wave
+ %{_prefix}/lib/nagios/plugins/negate
  %{_prefix}/lib/nagios/plugins/utils.pm
  %{_prefix}/lib/nagios/plugins/utils.sh