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

5 files changed, 67 insertions, 7 deletions

diff --git a/.cvsignore b/.cvsignore
index 75dae473..a3af660e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,6 +8,7 @@ command.cfg
 Cache.pm
 build-*
 intl
+ABOUT-NLS
 aclocal.m4
 autom4te*.cache
 install-sh
diff --git a/ChangeLog b/ChangeLog
index 965d4367..d08ce0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29  gettextize  <bug-gnu-gettext@gnu.org>
+
+        * configure.in (AM_GNU_GETTEXT_VERSION): Bump to 0.11.5.
+
 2003-07-02  gettextize  <bug-gnu-gettext@gnu.org>
 
         * Makefile.am (SUBDIRS): Add intl.
diff --git a/README b/README
index 85589a5f..ddc3f64e 100644
--- a/README
+++ b/README
@@ -1,10 +1,11 @@
 Nagios Plugins README
 ---------------------
 
-* For instructions on installing these plugins for use with Nagios, read
-  the INSTALL file.
+* For instructions on installing these plugins for use with Nagios,
+  see below. In addition, generic instructions for the GNU toolchain
+  can be found in the INSTALL file.
 
-* For information on what changes have been made or plugin have been added,
+* For information on what changes have been made or plugins have been added,
   read the Changelog file.
 
 * Some plugins require that you have additional programs and/or
@@ -14,7 +15,7 @@ Nagios Plugins README
 
 * Individual plugins are self documenting.  All plugins that comply with
   the basic guidelines for development will provide detailed help when
-  invoked with the '-h' option ('--help' also, if long options are enabled).
+  invoked with the '-h' or '--help' options.
 
 * The file command.cfg contains example configurations for many of the
   plugins
@@ -37,6 +38,60 @@ patch tool from the summary page).  Patches should be relative to the current
 CVS head (development), or to the head of the current stable branch. Also, 
 please include version information for your OS and the plugin(s) your are 
 patching/reporting.
- 
+
+
+
+
+Nagios Plugins Quick-and-Dirty Installation Instructions
+--------------------------------------------------------
+
+0) If using the CVS tree, you need m4, gettext, automake, and autoconf. To
+   start out, run ./tools/setup
+
+   For development, we generally use the most recent stable tools from
+   the FSF. Currently we use gettext 0.11.5, autoconf 2.57, and
+   automake 1.76. No other versions are tested, and you may see
+   warnings or errors with other versions.
+
+
+1) Run the configure script to initialize variables and create a Makefile, etc.
+
+        ./configure --prefix=BASEDIRECTORY --with-nagios-user=SOMEUSER --with-nagios-group=SOMEGROUP --with-cgiurl=SOMEURL
+
+   a) Replace BASEDIRECTORY with the path of the directory under which Nagios
+      is installed (default is '/usr/local/nagios')
+   b) Replace SOMEUSER with the name of a user on your system that will be
+      assigned permissions to the installed plugins (default is 'nagios')
+   c) Replace SOMEGRP with the name of a group on your system that will be
+      assigned permissions to the installed plugins (default is 'nagios')
+   d) Replace CGIURL with the path used to access the Nagios CGIs with
+      a web browser (default is '/nagios/cgi-bin')
+
+
+2) Compile the plugins with the following command:
+
+        make
+
+
+3) Install the compiled plugins and plugin scripts with the following command:
+
+        make install
+
+   The installation procedure will attempt to place the plugins in a 
+   'libexec/' subdirectory in the base directory you specified with
+   the --prefix argument to the configure script.
+
+
+4) Verify that your host configuration file (hosts.cfg) for Nagios contains
+   the correct paths to the new plugins.
+
+
+
+That's it.  If you have any problems or questions, feel free send mail
+to nagios-users@lists.sourceforge.net or nagiosplug-help@lists.sourceforge.net
+
+
+
+
 --
 Karl DeBisschop (kdebisschop@users.sourceforge.net)
diff --git a/configure.in b/configure.in
index 20f58fc9..c9c92d75 100644
--- a/configure.in
+++ b/configure.in
@@ -1382,7 +1382,7 @@ AC_SUBST(EXTRAS)
 AC_SUBST(EXTRA_NETOBJS)
 AC_SUBST(DEPLIBS)
 
-AM_GNU_GETTEXT_VERSION(0.11.4)
+AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT
 
 AC_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 20e196ce..2ae866c9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,6 +6,6 @@ noinst_HEADERS = getopt.h gettext.h fsusage.h mountlist.h
 
 libnagiosplug_a_SOURCES = getopt.c getopt1.c getloadavg.c snprintf.c fsusage.c mountlist.c
 
-EXTRA_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
+EXTRA_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
 
 INCLUDES = -I$(srcdir)