git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@345 f882894a-f735-0410-b71e-b25c423dba1c
@@ -3,7 +3,9 @@
SUBDIRS = lib plugins plugins-scripts
EXTRA_DIST = REQUIREMENTS SUPPORT acconfig.h subst.in subst.sh Helper.pm \
-contrib nagios-plugins.spec.in getloadavg.m4
+contrib nagios-plugins.spec.in
+
+ACLOCAL_AMFLAGS = -I lib
dist-hook:
sed "s/%%{VER}/@VER@/;s/%%{REL}/@REL@/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec
@@ -1,6 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-include(`aclocal.m4')
-include(`getloadavg.m4')
AC_REVISION ($Revision$)
AC_INIT(Helper.pm)
VER=1.3.0
@@ -25,7 +23,7 @@ AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_AWK
-AC_FUNC_GETLOADAVG(plugins)
+AC_FUNC_GETLOADAVG([lib])
ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AM_FUNC_STRTOD])
dnl AM_WITH_REGEX
AC_PROG_RANLIB
@@ -1,10 +1,12 @@
## Process this file with automake to produce Makefile.in
+EXTRA_DIST = getloadavg.m4
noinst_LIBRARIES = libnagiosplug.a
noinst_HEADERS = getopt.h
-libnagiosplug_a_SOURCES = getopt.c getopt1.c
+libnagiosplug_a_SOURCES = getopt.c getopt1.c getloadavg.c
INCLUDES = -I$(srcdir)
@@ -17,7 +17,7 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
check_tcp_programs = check_ftp check_imap check_nntp check_pop
EXTRA_DIST = t utils.c netutils.c popen.c \
- snprintf.c getloadavg.c
+ snprintf.c
PLUGINHDRS = common.h config.h