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 8468192d8388e2a9497a20ea81f95d1597a2b7bd..c987fa252b5a707c0e5fb4d3a51207d2782b8afd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -133,16 +133,8 @@ fi
 
 
 dnl Check for glib-2.4
 
 
 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
 
 
 dnl i18n


@@ -155,17 +147,11 @@ AC_ARG_ENABLE([nls],
 AC_MSG_RESULT([$enable_nls])
 
 if test "x$enable_nls" = xno; then
 AC_MSG_RESULT([$enable_nls])
 
 if test "x$enable_nls" = xno; then

-       glib24=no

        nls=no
 fi
 
 AM_NLS
        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
 
 if test "x$nls" = "xyes"; then
    AM_GLIB_GNU_GETTEXT