getopt: remove unnecessary ifdefs

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

diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index 644d641180e7f3280c74bbc5749fce0fd5113351..58ae7fc38292a036541569267d17c7acf1e8a7dc 100644 (file)
--- 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 10396a0c6c8e868448c348583743537efa2050cb..29735e51267a3cfbfb90eec343a761fec8c37318 100644 (file)
--- 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();