aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-12-25 03:01:41 +0100
committerMax Kellermann <max@duempel.org>2008-12-25 03:01:41 +0100
commit37f8c5e5429aec257987fcdcaa9e7aff3843e9e7 (patch)
tree4d5a643ff8f532dd57faa4790d21ac5d1e2a26bf
parentb1a22a68c613ec16d46a9a7a339934a20e585770 (diff)
downloadmpd-37f8c5e5429aec257987fcdcaa9e7aff3843e9e7.tar.gz
mpd-37f8c5e5429aec257987fcdcaa9e7aff3843e9e7.tar.xz
mpd-37f8c5e5429aec257987fcdcaa9e7aff3843e9e7.zip
configure.ac: drop support for GLib < 2.4
GLib 2.4 is required for proper NLS support. It is so old, we can safely remove support for GLib 2.2.
-rw-r--r--configure.ac20
1 files changed, 3 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 8468192d8..c987fa252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,16 +133,8 @@ fi
dnl Check for glib-2.4
-PKG_CHECK_MODULES([GLIB],
- [glib-2.0 >= 2.4],
- [glib24=yes],
- [AC_MSG_WARN([glib-2.4 is required for NLS support!])])
-if test "x$glib24" != "xyes"; then
- PKG_CHECK_MODULES([GLIB],
- [glib-2.0 >= 2.2],
- [nls=no],
- [AC_MSG_ERROR([glib-2.2 is required])])
-fi
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
+ [AC_MSG_ERROR([glib-2.2 is required])])
dnl i18n
@@ -155,17 +147,11 @@ AC_ARG_ENABLE([nls],
AC_MSG_RESULT([$enable_nls])
if test "x$enable_nls" = xno; then
- glib24=no
nls=no
fi
AM_NLS
-if test "x$glib24" = "xyes"; then
- nls=$USE_NLS
-else
- USE_NLS=no
- AC_SUBST(USE_NLS)
-fi
+nls=$USE_NLS
if test "x$nls" = "xyes"; then
AM_GLIB_GNU_GETTEXT