summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--aclocal.m492
-rw-r--r--configure.in14
-rw-r--r--nagios-plugins.spec.in6
4 files changed, 105 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index d1c7a68..00e5962 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,10 @@
2 2
3SUBDIRS = plugins plugins-scripts 3SUBDIRS = plugins plugins-scripts
4 4
5EXTRA_DIST = REQUIREMENTS acconfig.h package.def subst.in subst.sh Helper.pm nagios-plugins.spec contrib 5EXTRA_DIST = REQUIREMENTS acconfig.h subst.in subst.sh Helper.pm contrib nagios-plugins.spec.in
6
7dist-hook:
8 sed "s/PACKAGE_VERSION/@PACKAGE_VERSION@/;s/PACKAGE_RELEASE/@PACKAGE_RELEASE@/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec
6 9
7test: 10test:
8 cd plugins; $(MAKE) test 11 cd plugins; $(MAKE) test
diff --git a/aclocal.m4 b/aclocal.m4
index b75859d..c461ff3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,6 +10,98 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
10dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A 10dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
11dnl PARTICULAR PURPOSE. 11dnl PARTICULAR PURPOSE.
12 12
13# Do all the work for Automake. This macro actually does too much --
14# some checks are only needed if your package does certain things.
15# But this isn't really a big deal.
16
17# serial 1
18
19dnl Usage:
20dnl AM_INIT_AUTOMAKE(package,version, [no-define])
21
22AC_DEFUN([AM_INIT_AUTOMAKE],
23[AC_REQUIRE([AC_PROG_INSTALL])
24PACKAGE=[$1]
25AC_SUBST(PACKAGE)
26VERSION=[$2]
27AC_SUBST(VERSION)
28dnl test to see if srcdir already configured
29if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
30 AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
31fi
32ifelse([$3],,
33AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
34AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
35AC_REQUIRE([AM_SANITY_CHECK])
36AC_REQUIRE([AC_ARG_PROGRAM])
37dnl FIXME This is truly gross.
38missing_dir=`cd $ac_aux_dir && pwd`
39AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
40AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
41AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
42AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
43AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
44AC_REQUIRE([AC_PROG_MAKE_SET])])
45
46#
47# Check to make sure that the build environment is sane.
48#
49
50AC_DEFUN([AM_SANITY_CHECK],
51[AC_MSG_CHECKING([whether build environment is sane])
52# Just in case
53sleep 1
54echo timestamp > conftestfile
55# Do `set' in a subshell so we don't clobber the current shell's
56# arguments. Must try -L first in case configure is actually a
57# symlink; some systems play weird games with the mod time of symlinks
58# (eg FreeBSD returns the mod time of the symlink's containing
59# directory).
60if (
61 set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
62 if test "[$]*" = "X"; then
63 # -L didn't work.
64 set X `ls -t $srcdir/configure conftestfile`
65 fi
66 if test "[$]*" != "X $srcdir/configure conftestfile" \
67 && test "[$]*" != "X conftestfile $srcdir/configure"; then
68
69 # If neither matched, then we have a broken ls. This can happen
70 # if, for instance, CONFIG_SHELL is bash and it inherits a
71 # broken ls alias from the environment. This has actually
72 # happened. Such a system could not be considered "sane".
73 AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
74alias in your environment])
75 fi
76
77 test "[$]2" = conftestfile
78 )
79then
80 # Ok.
81 :
82else
83 AC_MSG_ERROR([newly created file is older than distributed files!
84Check your system clock])
85fi
86rm -f conftest*
87AC_MSG_RESULT(yes)])
88
89dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
90dnl The program must properly implement --version.
91AC_DEFUN([AM_MISSING_PROG],
92[AC_MSG_CHECKING(for working $2)
93# Run test in a subshell; some versions of sh will print an error if
94# an executable is not found, even if stderr is redirected.
95# Redirect stdin to placate older versions of autoconf. Sigh.
96if ($2 --version) < /dev/null > /dev/null 2>&1; then
97 $1=$2
98 AC_MSG_RESULT(found)
99else
100 $1="$3/missing $2"
101 AC_MSG_RESULT(missing)
102fi
103AC_SUBST($1)])
104
13# Like AC_CONFIG_HEADER, but automatically create stamp file. 105# Like AC_CONFIG_HEADER, but automatically create stamp file.
14 106
15AC_DEFUN([AM_CONFIG_HEADER], 107AC_DEFUN([AM_CONFIG_HEADER],
diff --git a/configure.in b/configure.in
index a9ffeb1..2341b25 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,12 @@
1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2include(`aclocal.m4') 2include(`aclocal.m4')
3AC_REVISION ($Revision$) 3AC_REVISION ($Revision$)
4AC_INIT(package.def) 4AC_INIT(Helper.pm)
5VERSION=`cat $srcdir/package.def|sed -e 's/PACKAGE_RELEASE= *"//;s/"//'` 5PACKAGE_VERSION="1.3.0"
6PACKAGE=nagios-plugins 6AC_SUBST(PACKAGE_VERSION)
7dnl AM_INIT_AUTOMAKE(nagios-plugins,$VERSION) 7PACKAGE_RELEASE="alpha1"
8AC_SUBST(PACKAGE_RELEASE)
9AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION}-${PACKAGE_RELEASE})
8AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h) 10AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
9 11
10AC_PREFIX_DEFAULT(/usr/local/nagios) 12AC_PREFIX_DEFAULT(/usr/local/nagios)
@@ -814,10 +816,6 @@ AC_TRY_COMPILE([#ifdef __STDC__
814AC_SUBST(EXTRAS) 816AC_SUBST(EXTRAS)
815AC_SUBST(DEPLIBS) 817AC_SUBST(DEPLIBS)
816 818
817AC_SUBST(PACKAGE)
818AC_SUBST(VERSION)
819AC_DEFINE_UNQUOTED(PACKAGE,"${PACKAGE}")
820AC_DEFINE_UNQUOTED(VERSION,"${VERSION}")
821AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"${VERSION}") 819AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"${VERSION}")
822 820
823AC_OUTPUT(Makefile subst plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl,echo timestamp > plugins/stamp-h1;echo timestamp > plugins/stamp-h2;echo timestamp > plugins/stamp-h3;echo timestamp > plugins/stamp-h4;echo timestamp > plugins/stamp-h5;echo timestamp > plugins/stamp-h6;PATH=.:..:$PATH subst.sh command.cfg) 821AC_OUTPUT(Makefile subst plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl,echo timestamp > plugins/stamp-h1;echo timestamp > plugins/stamp-h2;echo timestamp > plugins/stamp-h3;echo timestamp > plugins/stamp-h4;echo timestamp > plugins/stamp-h5;echo timestamp > plugins/stamp-h6;PATH=.:..:$PATH subst.sh command.cfg)
diff --git a/nagios-plugins.spec.in b/nagios-plugins.spec.in
index d220050..62b93d5 100644
--- a/nagios-plugins.spec.in
+++ b/nagios-plugins.spec.in
@@ -8,9 +8,9 @@
8%define name %{archive} 8%define name %{archive}
9%endif 9%endif
10 10
11%define version @PACKAGE_VERSION@ 11%define version PACKAGE_VERSION
12%define release @PACKAGE_RELEASE@ 12%define release PACKAGE_RELEASE
13%define source http://nagiosplug.sourceforge.net/src/%{archive}-%{version}-%{release}.tar.gz 13%define source %{archive}-%{version}-%{release}.tar.gz
14 14
15Name: %{name} 15Name: %{name}
16Version: %{version} 16Version: %{version}