aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorKalle Wallin <kaw@linux.se>2004-06-07 21:29:10 +0000
committerKalle Wallin <kaw@linux.se>2004-06-07 21:29:10 +0000
commita71d278498ffef2051c8430dd67795a157b8290e (patch)
tree62759842fd8e8444b423436c3cce76d7c833901d /configure.ac
parent77c69999a63e6b999814cb39c35bb4d30646c145 (diff)
downloadmpd-a71d278498ffef2051c8430dd67795a157b8290e.tar.gz
mpd-a71d278498ffef2051c8430dd67795a157b8290e.tar.xz
mpd-a71d278498ffef2051c8430dd67795a157b8290e.zip
Disable nls support if glib is pre 2.4 (OSX)
git-svn-id: https://svn.musicpd.org/ncmpc/trunk@1379 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--configure.ac37
1 files changed, 23 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 94e056200..c708b7feb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,6 @@ dnl =======================================================
set -- $CFLAGS
-
dnl
dnl Check for types
dnl
@@ -61,23 +60,31 @@ AC_CHECK_LIB([popt],
AC_MSG_ERROR([Missing popt command line parsing library]))
-dnl Check for glib-2
+dnl Check for glib-2.4
PKG_CHECK_MODULES([GLIB],
- [glib-2.0 >= 2.2],
- ,
- AC_MSG_ERROR([glib-2.2 is required]))
+ [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
+
dnl i18n
-ALL_LINGUAS=""
-AC_MSG_CHECKING([whether to include NLS support])
-AC_ARG_ENABLE([nls],
- AC_HELP_STRING([--enable-nls],
- [include natural language support @<:@default=yes@:>@]),
- [nls="$enableval"],
- [nls=yes])
-AC_MSG_RESULT([$nls])
+ALL_LINGUAS="sv"
+
+AM_NLS
+if test "x$glib24" = "xyes"; then
+ nls=$USE_NLS
+else
+ USE_NLS=no
+ AC_SUBST(USE_NLS)
+fi
+
if test "x$nls" = "xyes"; then
- ALL_LINGUAS="sv"
AM_GLIB_GNU_GETTEXT
GETTEXT_PACKAGE=$PACKAGE
AC_SUBST(GETTEXT_PACKAGE)
@@ -85,6 +92,8 @@ if test "x$nls" = "xyes"; then
["${GETTEXT_PACKAGE}"],
[gettext domain])
nls=$gt_cv_have_gettext
+else
+ AM_PO_SUBDIRS
fi