diff --git a/configure.ac b/configure.ac
index aedecefb77b307aaad5daf4329a9c19fffb9beed..92b46c3e972cf58c23193cf62466080e43344383 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.13, max@duempel.org)
+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])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
[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
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
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