From: Max Kellermann <max@duempel.org>
Date: Thu, 25 Dec 2008 02:01:41 +0000 (+0100)
Subject: configure.ac: drop support for GLib < 2.4
X-Git-Tag: release-0.13~55
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=37f8c5e5429aec257987fcdcaa9e7aff3843e9e7;p=ncmpc.git

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.
---

diff --git a/configure.ac b/configure.ac
index 8468192..c987fa2 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