summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bootstrap.conf2
-rw-r--r--configure.ac2
-rw-r--r--src/mbsupport.h13
3 files changed, 4 insertions, 13 deletions
diff --git a/bootstrap.conf b/bootstrap.conf
index c3b71586..64e4ea65 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -43,6 +43,7 @@ ignore-value
intprops
isblank
isdir
+iswctype
largefile
lseek
locale
@@ -79,6 +80,7 @@ useless-if-before-free
version-etc-fsf
wchar
wcrtomb
+wcscoll
wctob
wctype-h
xalloc
diff --git a/configure.ac b/configure.ac
index 6c0f29d4..3eff422d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,7 +183,7 @@ AC_HEADER_DIRENT
dnl Checks for functions.
AC_FUNC_CLOSEDIR_VOID
-AC_CHECK_FUNCS_ONCE(isascii iswctype setlocale wcscoll)
+AC_CHECK_FUNCS_ONCE(isascii setlocale)
dnl I18N feature
AM_GNU_GETTEXT_VERSION([0.18])
diff --git a/src/mbsupport.h b/src/mbsupport.h
index 06729e17..4529134c 100644
--- a/src/mbsupport.h
+++ b/src/mbsupport.h
@@ -17,21 +17,10 @@
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
02110-1301, USA. */
-
-/* This file is needed so that we test for i18n support in just one place.
- This gives us a consistent definition for all uses of MBS_SUPPORT. This
- follows the ``Don't Repeat Yourself'' principle from "The Pragmatic
- Programmer".
-
- The tests should be *all* the ones that are needed for an individual
- application. */
-
#include <stdlib.h>
-#if defined HAVE_WCSCOLL && defined HAVE_ISWCTYPE
+#ifndef MBS_SUPPORT
# define MBS_SUPPORT 1
-#else
-# define MBS_SUPPORT 0
#endif
#if ! MBS_SUPPORT