diff --git a/configure.ac b/configure.ac
index e2791a5b27636a975cbdeae92d5d5750b6d75244..6273a09ed0a6b0ab52d39e75d9226996ddd83b28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
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.9
PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.9],,
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 ],
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