summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl DeBisschop <kdebisschop@users.sourceforge.net>2003-07-29 05:43:38 (GMT)
committerKarl DeBisschop <kdebisschop@users.sourceforge.net>2003-07-29 05:43:38 (GMT)
commit1601cc5bfbc918c2bd5909cd0adf9dbf7a80c9b8 (patch)
treecdd3703355743c2ebfbed7b759c4472a31c649c5
parenta1a7871a02db0fbdaa4513d4f09ccab098931de2 (diff)
downloadmonitoring-plugins-1601cc5bfbc918c2bd5909cd0adf9dbf7a80c9b8.tar.gz
bump to gettext 0.11.5 and cleanup GNU toolchain
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@616 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--.cvsignore1
-rw-r--r--ChangeLog4
-rw-r--r--README65
-rw-r--r--configure.in2
-rw-r--r--lib/Makefile.am2
5 files changed, 67 insertions, 7 deletions
diff --git a/.cvsignore b/.cvsignore
index 75dae47..a3af660 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,6 +8,7 @@ command.cfg
8Cache.pm 8Cache.pm
9build-* 9build-*
10intl 10intl
11ABOUT-NLS
11aclocal.m4 12aclocal.m4
12autom4te*.cache 13autom4te*.cache
13install-sh 14install-sh
diff --git a/ChangeLog b/ChangeLog
index 965d436..d08ce0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12003-07-29 gettextize <bug-gnu-gettext@gnu.org>
2
3 * configure.in (AM_GNU_GETTEXT_VERSION): Bump to 0.11.5.
4
12003-07-02 gettextize <bug-gnu-gettext@gnu.org> 52003-07-02 gettextize <bug-gnu-gettext@gnu.org>
2 6
3 * Makefile.am (SUBDIRS): Add intl. 7 * Makefile.am (SUBDIRS): Add intl.
diff --git a/README b/README
index 85589a5..ddc3f64 100644
--- a/README
+++ b/README
@@ -1,10 +1,11 @@
1Nagios Plugins README 1Nagios Plugins README
2--------------------- 2---------------------
3 3
4* For instructions on installing these plugins for use with Nagios, read 4* For instructions on installing these plugins for use with Nagios,
5 the INSTALL file. 5 see below. In addition, generic instructions for the GNU toolchain
6 can be found in the INSTALL file.
6 7
7* For information on what changes have been made or plugin have been added, 8* For information on what changes have been made or plugins have been added,
8 read the Changelog file. 9 read the Changelog file.
9 10
10* Some plugins require that you have additional programs and/or 11* Some plugins require that you have additional programs and/or
@@ -14,7 +15,7 @@ Nagios Plugins README
14 15
15* Individual plugins are self documenting. All plugins that comply with 16* Individual plugins are self documenting. All plugins that comply with
16 the basic guidelines for development will provide detailed help when 17 the basic guidelines for development will provide detailed help when
17 invoked with the '-h' option ('--help' also, if long options are enabled). 18 invoked with the '-h' or '--help' options.
18 19
19* The file command.cfg contains example configurations for many of the 20* The file command.cfg contains example configurations for many of the
20 plugins 21 plugins
@@ -37,6 +38,60 @@ patch tool from the summary page). Patches should be relative to the current
37CVS head (development), or to the head of the current stable branch. Also, 38CVS head (development), or to the head of the current stable branch. Also,
38please include version information for your OS and the plugin(s) your are 39please include version information for your OS and the plugin(s) your are
39patching/reporting. 40patching/reporting.
40 41
42
43
44
45Nagios Plugins Quick-and-Dirty Installation Instructions
46--------------------------------------------------------
47
480) If using the CVS tree, you need m4, gettext, automake, and autoconf. To
49 start out, run ./tools/setup
50
51 For development, we generally use the most recent stable tools from
52 the FSF. Currently we use gettext 0.11.5, autoconf 2.57, and
53 automake 1.76. No other versions are tested, and you may see
54 warnings or errors with other versions.
55
56
571) Run the configure script to initialize variables and create a Makefile, etc.
58
59 ./configure --prefix=BASEDIRECTORY --with-nagios-user=SOMEUSER --with-nagios-group=SOMEGROUP --with-cgiurl=SOMEURL
60
61 a) Replace BASEDIRECTORY with the path of the directory under which Nagios
62 is installed (default is '/usr/local/nagios')
63 b) Replace SOMEUSER with the name of a user on your system that will be
64 assigned permissions to the installed plugins (default is 'nagios')
65 c) Replace SOMEGRP with the name of a group on your system that will be
66 assigned permissions to the installed plugins (default is 'nagios')
67 d) Replace CGIURL with the path used to access the Nagios CGIs with
68 a web browser (default is '/nagios/cgi-bin')
69
70
712) Compile the plugins with the following command:
72
73 make
74
75
763) Install the compiled plugins and plugin scripts with the following command:
77
78 make install
79
80 The installation procedure will attempt to place the plugins in a
81 'libexec/' subdirectory in the base directory you specified with
82 the --prefix argument to the configure script.
83
84
854) Verify that your host configuration file (hosts.cfg) for Nagios contains
86 the correct paths to the new plugins.
87
88
89
90That's it. If you have any problems or questions, feel free send mail
91to nagios-users@lists.sourceforge.net or nagiosplug-help@lists.sourceforge.net
92
93
94
95
41-- 96--
42Karl DeBisschop (kdebisschop@users.sourceforge.net) 97Karl DeBisschop (kdebisschop@users.sourceforge.net)
diff --git a/configure.in b/configure.in
index 20f58fc..c9c92d7 100644
--- a/configure.in
+++ b/configure.in
@@ -1382,7 +1382,7 @@ AC_SUBST(EXTRAS)
1382AC_SUBST(EXTRA_NETOBJS) 1382AC_SUBST(EXTRA_NETOBJS)
1383AC_SUBST(DEPLIBS) 1383AC_SUBST(DEPLIBS)
1384 1384
1385AM_GNU_GETTEXT_VERSION(0.11.4) 1385AM_GNU_GETTEXT_VERSION(0.11.5)
1386AM_GNU_GETTEXT 1386AM_GNU_GETTEXT
1387 1387
1388AC_OUTPUT(Makefile lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl pkg/solaris/pkginfo intl/Makefile po/Makefile.in ) 1388AC_OUTPUT(Makefile lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl pkg/solaris/pkginfo intl/Makefile po/Makefile.in )
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 20e196c..2ae866c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,6 +6,6 @@ noinst_HEADERS = getopt.h gettext.h fsusage.h mountlist.h
6 6
7libnagiosplug_a_SOURCES = getopt.c getopt1.c getloadavg.c snprintf.c fsusage.c mountlist.c 7libnagiosplug_a_SOURCES = getopt.c getopt1.c getloadavg.c snprintf.c fsusage.c mountlist.c
8 8
9EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 afs.m4 fstypename.m4 fsusage.m4 ls-mntd-fs.m4 9EXTRA_DIST = ulonglong.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 afs.m4 fstypename.m4 fsusage.m4 ls-mntd-fs.m4
10 10
11INCLUDES = -I$(srcdir) 11INCLUDES = -I$(srcdir)