screen_utils: Moved the colons of the prompts to wreadln.

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a6884456dcc2d80534e5248fb9b60392aa7743cc..a7efe75224ff0d3102e3acea37565d921ec4e527 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_PREREQ(2.60)
-AC_INIT(ncurses MPD client, 0.13~git, max@duempel.org, ncmpc)
+AC_INIT(ncmpc, 0.14~git, max@duempel.org)
 AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_AUX_DIR(build)
 AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -14,7 +15,7 @@ dnl initialize variables
 dnl =======================================================
 
 dnl i18n
-ALL_LINGUAS="es da de fr gl no ru sk sv hu"
+ALL_LINGUAS=`grep -v '^\#' po/LINGUAS`
 
 set -- $CFLAGS
 
@@ -125,10 +126,25 @@ if test "x$enable_wide" = "xyes" ; then
     AC_DEFINE([ENABLE_WIDE], [1], [Enable wide character support])
 fi
 
+dnl multi-byte character support
+
+AC_ARG_ENABLE([multibyte],
+       AC_HELP_STRING([--disable-multibyte],
+               [Disable multibyte character support (default: enabled)]),
+               [enable_multibyte=$enableval],
+               [enable_multibyte=$disable_mini])
+
+if test x$enable_multibyte = xyes; then
+       AC_DEFINE([ENABLE_MULTIBYTE], [1], [Enable multibyte character support])
+else
+       if test x$enable_wide = xyes; then
+               AC_MSG_WARN(wide characters without multibyte characters makes little sense)
+       fi
+fi
 
 dnl Check for glib-2.4
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
-       [AC_MSG_ERROR([glib-2.2 is required])])
+       [AC_MSG_ERROR([glib 2.4 is required])])
 
 
 dnl i18n
@@ -154,19 +170,21 @@ if test x$enable_locale = xyes; then
        AC_DEFINE([ENABLE_LOCALE], [1], [Locale support is enabled])
 fi
 
+if test x$enable_mini != xyes; then
+       AM_NLS
+else
+       USE_NLS=no
+fi
 
-AM_NLS
-nls=$USE_NLS
-
-if test "x$nls" = "xyes"; then
+if test x$USE_NLS = xyes; then
    AM_GLIB_GNU_GETTEXT
    GETTEXT_PACKAGE=$PACKAGE
    AC_SUBST(GETTEXT_PACKAGE)
    AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], 
                       ["${GETTEXT_PACKAGE}"], 
                       [gettext domain])
-  nls=$gt_cv_have_gettext
-  if test "x$nls" != "xyes"; then
+       USE_NLS=$gt_cv_have_gettext
+       if test x$USE_NLS != xyes; then
      AC_MSG_WARN([NLS support disabled!])
   fi
 else