diff --git a/configure.ac b/configure.ac
index 603829c770a8bda9f9fb552e6cf60c9dc4818f1f..37b126bca6dc10971a4f7d9993a836e1eb1d0f56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.60)
AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.21~git, max@duempel.org)
+AC_INIT(ncmpc, 0.21, max@duempel.org)
+
+VERSION_MAJOR=0
+VERSION_MINOR=21
+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])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR(build)
AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
case "$host_os" in
mingw32* | windows*)
LIBS="$LIBS -lws2_32"
case "$host_os" in
mingw32* | windows*)
LIBS="$LIBS -lws2_32"
- ;;
+ AC_CONFIG_FILES([
+ src/win/ncmpc_win32_rc.rc
+ ])
+ AC_CHECK_TOOL(WINDRES, windres)
+ HAVE_WINDOWS=1
+ ;;
*)
AC_CHECK_FUNC([socket],
[],
*)
AC_CHECK_FUNC([socket],
[],
[AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
[AC_MSG_ERROR(No UNIX gethostbyname API found)])
])
[AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
[AC_MSG_ERROR(No UNIX gethostbyname API found)])
])
+
+ HAVE_WINDOWS=0
esac
esac
+AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
dnl multi-byte character support
dnl multi-byte character support
fi
fi
fi
fi
-dnl Check for glib-2.12
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12],,
- [AC_MSG_ERROR([glib 2.12 is required])])
+dnl Check for GLib
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14],,
+ [AC_MSG_ERROR([glib 2.14 is required])])
dnl Check for libmpdclient 2.2
PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.2],,
[AC_MSG_ERROR([libmpdclient2 is required])])
dnl Check for libmpdclient 2.2
PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.2],,
[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
dnl i18n
AC_SUBST(lyrics_plugin_dir)
AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$enable_lyrics_screen = xyes)
AC_SUBST(lyrics_plugin_dir)
AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$enable_lyrics_screen = xyes)
-AM_CONDITIONAL(ENABLE_SCREEN_TEXT, test x$enable_lyrics_screen = xyes)
dnl Optional screen - outputs
AC_MSG_CHECKING([whether to include the outputs screen])
dnl Optional screen - outputs
AC_MSG_CHECKING([whether to include the outputs screen])
AC_MSG_RESULT([$enable_outputs_screen])
AC_MSG_RESULT([$enable_outputs_screen])
+dnl Optional screen - client-to-client chat
+AC_MSG_CHECKING([whether to include the chat screen])
+AC_ARG_ENABLE([chat-screen],
+ AC_HELP_STRING([--enable-chat-screen],
+ [Enable chat screen @<:@default=no@:>@]),,
+ [enable_chat_screen=no])
+if test "x$enable_chat_screen" = "xauto"; then
+ enable_chat_screen=$have_libmpdclient_2_5
+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)
+
+AM_CONDITIONAL(ENABLE_SCREEN_TEXT,
+ test x$enable_lyrics_screen = xyes -o x$enable_chat_screen = xyes)
+
+dnl
+dnl Windows OS Resource File
+dnl
+AC_SUBST(VERSION_MAJOR)
+AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_REVISION)
+AC_SUBST(VERSION_EXTRA)
dnl
dnl build options
dnl
dnl build options