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

2 files changed, 2 insertions, 7 deletions

diff --git a/plugins-root/.cvsignore b/plugins-root/.cvsignore
index e3a62594..70dc1744 100644
--- a/plugins-root/.cvsignore
+++ b/plugins-root/.cvsignore
@@ -1,5 +1,7 @@
 .deps
+.libs
 Makefile.in
 Makefile
 check_dhcp
 check_icmp
+pst3
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index a3e0c53c..836bafb3 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -101,7 +101,6 @@ long mac_addr_dlpi( const char *, int, u_char *);
 
 #endif
 
-#define HAVE_GETOPT_H
 
 
 /**** Common definitions ****/
@@ -976,7 +975,6 @@ int call_getopt(int argc, char **argv){
         int i=0;
         struct in_addr ipaddress;
 
-#ifdef HAVE_GETOPT_H
         int option_index = 0;
         static struct option long_options[] =
         { 
@@ -989,14 +987,9 @@ int call_getopt(int argc, char **argv){
                 {"help",           no_argument,      0,'h'},
                 {0,0,0,0}
         };
-#endif
 
         while(1){
-#ifdef HAVE_GETOPT_H
                 c=getopt_long(argc,argv,"+hVvt:s:r:t:i:",long_options,&option_index);
-#else
-                c=getopt(argc,argv,"+?hVvt:s:r:t:i:");
-#endif
 
                 i++;