diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/getloadavg.c (renamed from plugins/getloadavg.c) | 0 | ||||
| -rw-r--r-- | lib/getloadavg.m4 (renamed from getloadavg.m4) | 0 | ||||
| -rw-r--r-- | plugins/Makefile.am | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 71c40cb9..3d919261 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.in b/configure.in index 5d9e45cd..38c2470e 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/lib/Makefile.am b/lib/Makefile.am index 7727b282..afa91a6d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -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) diff --git a/plugins/getloadavg.c b/lib/getloadavg.c index e9c4c088..e9c4c088 100644 --- a/plugins/getloadavg.c +++ b/lib/getloadavg.c diff --git a/getloadavg.m4 b/lib/getloadavg.m4 index ff8cf309..ff8cf309 100644 --- a/getloadavg.m4 +++ b/lib/getloadavg.m4 diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 7015466d..851745a7 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -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 |