playlist: added function playlist_move()

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6211f0ee6dd4216a3ff8db07c64d83fc5889a5c0..92b46c3e972cf58c23193cf62466080e43344383 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.16~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,29 @@ 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 Check for libmpdclient 2.0
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.0],,
+       [AC_MSG_ERROR([libmpdclient2 is required])])
 
 
 dnl i18n
@@ -347,37 +367,6 @@ fi
 
 AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$outputs_screen = xyes)
 
-dnl Default host
-AC_MSG_CHECKING([for default MPD host])
-AC_ARG_WITH([default-host],
-           AC_HELP_STRING([--with-default-host=ARG],
-                          [Default MPD host @<:@localhost@:>@]),
-            [DEFAULT_HOST="$withval"],
-            [DEFAULT_HOST="localhost"])
-AC_MSG_RESULT([$DEFAULT_HOST])
-AC_DEFINE_UNQUOTED([DEFAULT_HOST], ["$DEFAULT_HOST"], [Default MPD host])
-
-dnl Default port
-AC_MSG_CHECKING([for default MPD port])
-AC_ARG_WITH([default-port],
-            AC_HELP_STRING([--with-default-port=ARG],
-                           [Default port @<:@6600@:>@]),
-            [DEFAULT_PORT="$withval"],
-            [DEFAULT_PORT="6600"])
-AC_MSG_RESULT([$DEFAULT_PORT])
-AC_DEFINE_UNQUOTED([DEFAULT_PORT],     [$DEFAULT_PORT],   [Default MPD port])
-AC_DEFINE_UNQUOTED([DEFAULT_PORT_STR], ["$DEFAULT_PORT"], [Default MPD port])
-
-dnl Default timedisplay type
-AC_MSG_CHECKING([for default timedisplay type])
-AC_ARG_WITH([default-timedisplay_type],
-           AC_HELP_STRING([--with-default-timedisplay_type=ARG],
-                          [default_timedisplay]),
-            [DEFAULT_TIMEDISPLAY_TYPE="$withval"],
-            [DEFAULT_TIMEDISPLAY_TYPE="elapsed"])
-AC_MSG_RESULT([$DEFAULT_TIMEDISPLAY_TYPE])
-AC_DEFINE_UNQUOTED([DEFAULT_TIMEDISPLAY_TYPE], ["$DEFAULT_TIMEDISPLAY_TYPE"], [Default way to display time, either 'elapsed' or 'remaining'])
-
 
 dnl
 dnl build options
@@ -426,5 +415,5 @@ dnl
 dnl Generate output files
 dnl
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in po/Makefile])
+AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile])
 AC_OUTPUT