stop popt from doing its own intl stuff

(This used to be commit 1a5ef2425747c2e0c7cf28fc7712563039086100)

diff --git a/source3/popt/poptint.h b/source3/popt/poptint.h
index a1edb97c4b071318ae29f221b482cd1760510332..1847ffafe674770f7d62b800977661f228ad3936 100644 (file)
--- a/source3/popt/poptint.h
+++ b/source3/popt/poptint.h
@@ -64,24 +64,8 @@ struct poptContext_s {
 
 #define        xfree(_a)       free((void *)_a)
 
-#ifdef HAVE_LIBINTL_H
-#include <libintl.h>
-#endif
-
-#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
-#define _(foo) gettext(foo)
-#else
-#define _(foo) (foo)
-#endif
-
-#if defined(HAVE_DGETTEXT) && !defined(__LCLINT__)
-#define D_(dom, str) dgettext(dom, str)
-#define POPT_(foo) D_("popt", foo)
-#else
 #define POPT_(foo) (foo)
 #define D_(dom, str) (str)
-#endif
-
 #define N_(foo) (foo)
 
 #endif