X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=675008ffb56e916ddfcd2dfc6d53c607b8903277;hb=402546df0425d678a8d25604ca5fd7d27ad07723;hp=b087c35b4b9ae1c70fa2486d6213a7f8155c12df;hpb=3bd95ba62353144987b8008435045b07d2307dd1;p=ncmpc.git diff --git a/configure.ac b/configure.ac index b087c35..675008f 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.27, max@duempel.org) + +VERSION_MAJOR=0 +VERSION_MINOR=27 +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 @@ -20,7 +28,7 @@ dnl initialize variables dnl ======================================================= dnl i18n -ALL_LINGUAS=`grep -v '^\#' po/LINGUAS` +ALL_LINGUAS=`grep -v '^\#' $srcdir/po/LINGUAS` set -- $CFLAGS @@ -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,39 @@ 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.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 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 @@ -134,11 +149,31 @@ else 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 ], @@ -165,8 +200,12 @@ AC_ARG_ENABLE([lirc], [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 @@ -188,16 +227,14 @@ AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes) 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]) @@ -274,8 +311,7 @@ dnl Optional screen - lyrics 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 @@ -310,7 +346,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,7 +353,7 @@ AC_ARG_ENABLE([outputs-screen], AS_HELP_STRING([--enable-outputs-screen], [Enable outputs screen @<:@default=yes@:>@]),, [enable_outputs_screen=$disable_mini]) -AC_MSG_RESULT([$enable_outputs_screen]) + if test "x$enable_outputs_screen" = "xyes" ; then AC_DEFINE(ENABLE_OUTPUTS_SCREEN, 1, [Enable outputs screen]) fi @@ -327,6 +362,31 @@ 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=yes +fi +AC_MSG_RESULT([$enable_chat_screen]) +if test "x$enable_chat_screen" = "xyes" ; then + 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 @@ -334,7 +394,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 @@ -343,11 +403,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, @@ -357,6 +422,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 @@ -364,6 +447,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]) @@ -380,4 +467,4 @@ dnl Generate output files dnl AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile]) -AC_OUTPUT +AC_OUTPUT(doc/doxygen.conf)