From: Karel Zak <kzak@redhat.com>
Date: Wed, 26 Nov 2008 13:25:25 +0000 (+0100)
Subject: getopt: remove unnecessary ifdefs
X-Git-Tag: v2.15-rc1~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7327f20924a993a55573666149149b72ea8af32;p=thirdparty%2Futil-linux.git

getopt: remove unnecessary ifdefs

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index 644d641180..58ae7fc382 100644
--- a/getopt/Makefile.am
+++ b/getopt/Makefile.am
@@ -1,9 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
 usrbinexec_PROGRAMS = getopt
-
-getopt_CPPFLAGS = -DLIBCGETOPT=1 $(AM_CPPFLAGS)
-
 dist_man_MANS = getopt.1
 
 exampledir = $(datadir)/getopt/
diff --git a/getopt/getopt.c b/getopt/getopt.c
index 10396a0c6c..29735e5126 100644
--- a/getopt/getopt.c
+++ b/getopt/getopt.c
@@ -44,12 +44,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
-
-#if LIBCGETOPT
 #include <getopt.h>
-#else
-#include "getopt.h"
-#endif
 
 #include "nls.h"
 
@@ -373,12 +368,9 @@ int main(int argc, char *argv[])
 	int opt;
 	int compatible=0;
 
-#if WITHOUT_GETTEXT
-#else
 	setlocale(LC_ALL,"");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
-#endif
 
 	init_longopt();