diff --git a/configure.ac b/configure.ac
index 4cbb542228cc28d9e0349eb12ea7d244ab6d513a..6273a09ed0a6b0ab52d39e75d9226996ddd83b28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.22~git, max@duempel.org)
+AC_INIT(ncmpc, 0.26, max@duempel.org)
VERSION_MAJOR=0
-VERSION_MINOR=21
+VERSION_MINOR=26
VERSION_REVISION=0
VERSION_EXTRA=0
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([foreign 1.11 dist-xz subdir-objects])
+AM_SILENT_RULES
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
+
dnl Check for programs
AC_PROG_CC_C99
AC_PROG_INSTALL
dnl =======================================================
dnl i18n
-ALL_LINGUAS=`grep -v '^\#' po/LINGUAS`
+ALL_LINGUAS=`grep -v '^\#' $srcdir/po/LINGUAS`
set -- $CFLAGS
fi
dnl Check for GLib
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14],,
- [AC_MSG_ERROR([glib 2.14 is required])])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.30],,
+ [AC_MSG_ERROR([glib 2.30 is required])])
-dnl Check for libmpdclient 2.2
-PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.2],,
+dnl Check for libmpdclient 2.9
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.9],,
[AC_MSG_ERROR([libmpdclient2 is required])])
-dnl Check for libmpdclient 2.5 (the chat screen requires this version)
-PKG_CHECK_EXISTS([libmpdclient >= 2.5],
- [have_libmpdclient_2_5=yes], [have_libmpdclient_2_5=no])
-
dnl i18n
AC_ARG_ENABLE([locale],
AM_PO_SUBDIRS
fi
+dnl Networking
+
+AC_ARG_ENABLE(tcp,
+ AS_HELP_STRING([--disable-tcp],
+ [Disable TCP support @<:@default=enabled@:>@]),,
+ [enable_tcp=$disable_mini])
+if test "x$enable_tcp" = xyes; then
+ AC_DEFINE([ENABLE_TCP], 1, [Define to enable TCP support])
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_CHECK_FUNCS([getaddrinfo])
+fi
+
+AC_ARG_ENABLE([async-connect],
+ AS_HELP_STRING([--enable-async-connect],
+ [Disable asynchronous connect @<:@default=yes@:>@]),,
+ [enable_async_connect=$disable_mini])
+AM_CONDITIONAL(ENABLE_ASYNC_CONNECT, test x$enable_async_connect = xyes)
+if test "x$enable_async_connect" = xyes; then
+ AC_DEFINE([ENABLE_ASYNC_CONNECT], [1], [Enable asynchronous connect?])
+fi
+
dnl enable colors
AC_ARG_ENABLE([colors],
AS_HELP_STRING([--enable-colors],
- [Enable color support]),
- [enable_colors=$enableval],
+ [Enable color support]),,
[enable_colors=auto])
AC_MSG_CHECKING([whether to include color support])
AS_IF([ test "x$enable_colors" = xyes || test "x$enable_colors" = xauto ],
[Enable LIRC support]),,
[enable_lirc=no])
if test x$enable_lirc = xyes; then
- PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
- [AC_MSG_ERROR([liblircclient0 not found])])
+ PKG_CHECK_MODULES([LIBLIRCCLIENT], [lirc],,
+ [PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+ [AC_MSG_ERROR([lirc not found])]
+ )]
+ )
+
AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
fi
dnl Optional - curses getmouse support
-dnl AC_CHECK_LIB depends on being able to prepend a '-l', remove the '-l' from CURSES_LIB first
-AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
- [getmouse],
+MPD_WITH_LIBRARY([CURSES],
+ [AC_CHECK_FUNC([getmouse],
[ax_cv_curses_mouse=yes],
- [ax_cv_curses_mouse=no])
+ [ax_cv_curses_mouse=no])])
AC_ARG_ENABLE([mouse],
AS_HELP_STRING([--enable-mouse],
- [Enable curses getmouse support @<:@default=yes@:>@]),
- [enable_mouse=$enableval],
+ [Enable curses getmouse support @<:@default=yes@:>@]),,
[enable_mouse=auto])
AC_MSG_CHECKING([whether to include mouse support])
AC_MSG_CHECKING([whether to include the lyrics screen])
AC_ARG_ENABLE([lyrics-screen],
AS_HELP_STRING([--enable-lyrics-screen],
- [Enable lyrics screen @<:@default=no@:>@]),
- [enable_lyrics_screen=$enableval],
+ [Enable lyrics screen @<:@default=no@:>@]),,
[enable_lyrics_screen=no])
case "$host_os" in
[Enable chat screen @<:@default=no@:>@]),,
[enable_chat_screen=no])
if test "x$enable_chat_screen" = "xauto"; then
- enable_chat_screen=$have_libmpdclient_2_5
+ enable_chat_screen=yes
fi
AC_MSG_RESULT([$enable_chat_screen])
if test "x$enable_chat_screen" = "xyes" ; then
- if test "x$have_libmpdclient_2_5" = "xno"; then
- AC_MSG_ERROR(The chat screen requires at least libmpclient 2.5)
- fi
AC_DEFINE(ENABLE_CHAT_SCREEN, 1, [Enable chat screen])
fi
AM_CONDITIONAL(ENABLE_CHAT_SCREEN, test x$enable_chat_screen = xyes)