Synchronise with coreutils 2.95. Gettext now synced with coreutils,

so no longer development platform requirement


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1394 f882894a-f735-0410-b71e-b25c423dba1c

4 files changed, 6 insertions, 4 deletions

diff --git a/plugins/.cvsignore b/plugins/.cvsignore
index 7ac1835..f75aab2 100644
--- a/plugins/.cvsignore
+++ b/plugins/.cvsignore
@@ -1,3 +1,4 @@
+check_apt
 check_disk
 check_dns
 check_dummy
@@ -5,11 +6,13 @@ check_ftp
 check_fping
 check_http
 check_imap
+check_jabber
 check_load
 check_mrtg
 check_mrtgtraf
 check_nagios
 check_nntp
+check_ntp
 check_nwstat
 check_overcr
 check_ping
@@ -46,3 +49,4 @@ Makefile
 Makefile.in
 config.h.in
 .deps
+.libs
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index ef236c0..898e6cb 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -171,7 +171,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  mount_list = read_filesystem_list (0);
+  mount_list = read_file_system_list (0);
 
   if (process_arguments (argc, argv) == ERROR)
     usage4 (_("Could not parse arguments"));
diff --git a/plugins/common.h b/plugins/common.h
index 57f4f93..baed12e 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -83,10 +83,7 @@
 #include <signal.h>
 #endif
 
-/* TODO: define can be removed when all ifdef in each plugin has been removed */
-#define HAVE_GETOPT_H
 #include <getopt.h>
-
 #include <ctype.h>
 
 #ifdef HAVE_LWRES_NETDB_H
diff --git a/plugins/tests/.cvsignore b/plugins/tests/.cvsignore
index 95112e1..94b5122 100644
--- a/plugins/tests/.cvsignore
+++ b/plugins/tests/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 test_utils
+.deps