summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--system.h15
2 files changed, 1 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 75587eba8..01cd71fef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,7 +353,6 @@ AC_HEADER_STDC
AC_HEADER_MAJOR
AC_HEADER_DIRENT
-AC_CHECK_HEADERS(locale.h)
AC_CHECK_HEADERS(limits.h)
AC_CHECK_HEADERS(fcntl.h getopt.h memory.h)
@@ -688,8 +687,6 @@ if test "$with_dmalloc" = yes ; then
LIBS="$LIBS -ldmalloc"
fi
-AC_CHECK_FUNCS(setlocale)
-
AC_CHECK_FUNCS(getpassphrase)
AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT, 1, [Define if you have the getmntent() function]), [
diff --git a/system.h b/system.h
index 25f129860..4d7a7d34c 100644
--- a/system.h
+++ b/system.h
@@ -154,25 +154,12 @@ typedef char * security_context_t;
extern const char *__progname;
/* Take care of NLS matters. */
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale) /* empty */
-#endif
-
#if ENABLE_NLS
+# include <locale.h>
# include <libintl.h>
# define _(Text) dgettext (PACKAGE, Text)
#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */
# define _(Text) Text
-# undef dgettext
-# define dgettext(DomainName, Text) Text
#endif
#define N_(Text) Text