X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=9ab434e10b213ff58295e73fdcb25ab6abc42283;hb=a0dcef5c1685813aa7f70bf7b7fd5f95f441d1b1;hp=4e85b10ecdd92d302a7455fae47d3e7c00199da5;hpb=44cf194be4a3400900ef6eca7e31f673dd5cce0a;p=ncmpc.git diff --git a/configure.ac b/configure.ac index 4e85b10..9ab434e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,19 @@ AC_PREREQ(2.60) -AC_INIT(ncmpc, 0.20~git, max@duempel.org) +AC_INIT(ncmpc, 0.22, max@duempel.org) + +VERSION_MAJOR=0 +VERSION_MINOR=22 +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 @@ -31,7 +39,7 @@ dnl AC_ARG_ENABLE(mini, AS_HELP_STRING([--enable-mini], - [Build ncmpc-mini, i.e. without all optional features (default: disabled)]),, + [Build ncmpc-mini, i.e. without all optional features @<:@default=no@:>@]),, [enable_mini=no]) AM_CONDITIONAL(NCMPC_MINI, test x$enable_mini = xyes) @@ -51,8 +59,13 @@ AC_CANONICAL_HOST 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], [], @@ -65,37 +78,43 @@ mingw32* | windows*) [AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"], [AC_MSG_ERROR(No UNIX gethostbyname API found)]) ]) + + HAVE_WINDOWS=0 esac +AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1]) dnl multi-byte character support AC_ARG_ENABLE([multibyte], AS_HELP_STRING([--disable-multibyte], - [Disable multibyte character support (default: enabled)]),, + [Disable multibyte character support @<:@default=yes@:>@]),, [enable_multibyte=$disable_mini]) if test x$enable_multibyte = xyes; then AC_DEFINE([ENABLE_MULTIBYTE], [1], [Enable multibyte character support]) else - if test "x$ax_cv_ncursesw" = xyes; then + if test "x$ax_cv_curses_enhanced" = xyes; then AC_MSG_WARN(wide characters without multibyte characters makes little sense) 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],, +dnl Check for libmpdclient 2.3 +PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.3],, [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], AS_HELP_STRING([--disable-locale], - [Disable locale support (default: auto)]),, + [Disable locale support @<:@default=auto@:>@]),, [enable_locale=$auto_mini]) if test x$enable_locale = xyes; then @@ -310,7 +329,6 @@ AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$lyrics_plugin_dir"], 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]) @@ -318,6 +336,7 @@ AC_ARG_ENABLE([outputs-screen], AS_HELP_STRING([--enable-outputs-screen], [Enable outputs screen @<:@default=yes@:>@]),, [enable_outputs_screen=$disable_mini]) + if test "x$enable_outputs_screen" = "xyes" ; then AC_DEFINE(ENABLE_OUTPUTS_SCREEN, 1, [Enable outputs screen]) fi @@ -326,6 +345,34 @@ AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$enable_outputs_screen = xyes) 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 @@ -333,7 +380,7 @@ dnl AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], - [Treat warnings as errors (default: disabled)]),, + [Treat warnings as errors @<:@default=no@:>@]),, enable_werror=no) if test "x$enable_werror" = xyes; then @@ -342,11 +389,16 @@ fi AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], - [Enable debugging (default: disabled)]),, + [Enable debugging @<:@default=no@:>@]),, enable_debug=no) if test "x$enable_debug" = xno; then AM_CFLAGS="$AM_CFLAGS -DNDEBUG" + + AX_APPEND_COMPILE_FLAGS([-ffunction-sections]) + AX_APPEND_COMPILE_FLAGS([-fdata-sections]) + + AX_APPEND_LINK_FLAGS([-Wl,--gc-sections]) fi AC_ARG_ENABLE(test, @@ -356,6 +408,24 @@ AC_ARG_ENABLE(test, AM_CONDITIONAL(ENABLE_TEST, test "x$enable_test" = xyes) +dnl +dnl autogenerated documentation +dnl + +AC_ARG_ENABLE(documentation, + AS_HELP_STRING([--enable-documentation], + [build doxygen documentation @<:@default=no@:>@]),, + enable_documentation=no) + +if test x$enable_documentation = xyes; then + AC_PATH_PROG(DOXYGEN, doxygen) + if test x$DOXYGEN = x; then + AC_MSG_ERROR([doxygen not found]) + fi + AC_SUBST(DOXYGEN) +fi + +AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes) dnl dnl CFLAGS @@ -363,6 +433,10 @@ dnl AC_SUBST(AM_CFLAGS) +AX_APPEND_COMPILE_FLAGS([-fvisibility=hidden]) +AX_APPEND_COMPILE_FLAGS([-ffast-math]) +AX_APPEND_COMPILE_FLAGS([-ftree-vectorize]) + AX_APPEND_COMPILE_FLAGS([-Wall]) AX_APPEND_COMPILE_FLAGS([-Wextra]) AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations]) @@ -379,4 +453,4 @@ dnl Generate output files dnl AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile]) -AC_OUTPUT +AC_OUTPUT(doc/doxygen.conf)