X-Git-Url: https://git.tokkee.org/?p=ncmpc.git;a=blobdiff_plain;f=configure.ac;h=6273a09ed0a6b0ab52d39e75d9226996ddd83b28;hp=3dc9234e7a694529e5f628ec8a9881e88b0bc92b;hb=e79707f956f639af800abe2180f15d3ac3107d58;hpb=031c52f873b908cb2bea5cb4c6d01949df6cace1 diff --git a/configure.ac b/configure.ac index 3dc9234..6273a09 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,34 @@ AC_PREREQ(2.60) -AC_INIT(ncmpc, 0.20~git, max@duempel.org) +AC_INIT(ncmpc, 0.26, max@duempel.org) + +VERSION_MAJOR=0 +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_CONFIG_HEADER([config.h]) +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 +AX_WITH_CURSES + +AS_IF([ test "x$ax_cv_curses" = xno ], + [AC_MSG_ERROR([No curses support detected.]) + ]) dnl ======================================================= dnl initialize variables dnl ======================================================= dnl i18n -ALL_LINGUAS=`grep -v '^\#' po/LINGUAS` +ALL_LINGUAS=`grep -v '^\#' $srcdir/po/LINGUAS` set -- $CFLAGS @@ -26,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) @@ -35,124 +48,69 @@ if test "x$enable_mini" = xyes; then auto=no disable_mini=no auto_mini=no - ncurses=ncurses else auto=auto disable_mini=yes auto_mini=auto - ncurses=auto -fi - - -dnl -dnl Check for libraries -dnl - -dnl Try to find the socket functions -AC_CHECK_FUNC([socket], - [], - [AC_CHECK_LIB([socket],[socket],[LIBS="$LIBS -lsocket"], - [AC_MSG_ERROR(No UNIX socket API found)]) - ]) - -dnl Try to find the gethostbyname functions -AC_CHECK_FUNC([gethostbyname], - [], - [AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"], - [AC_MSG_ERROR(No UNIX gethostbyname API found)]) - ]) - - -dnl wide character support -AC_ARG_ENABLE([wide], - AS_HELP_STRING([--enable-wide], - [Enable wide character support]),, - [enable_wide=auto]) - - -dnl ncurses -AC_ARG_WITH([ncurses], - AS_HELP_STRING([--with-ncurses], [compile/link with ncurses library] ), - [ncurses=ncurses]) -AC_ARG_WITH(ncursesw, - AS_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]), - [ncurses=ncursesw]) - -if test "x$enable_wide" = "xno"; then - if test "x$ncurses" = "xauto"; then - dnl select narrow ncurses - ncurses=ncurses - fi - - if test "x$ncurses" = "xncursesw"; then - AC_MSG_WARN([Narrow ncmpc linking against wide libncurses]) - fi -fi - -if test "x$ncurses" = "xauto"; then - AC_CHECK_LIB([ncursesw], - [initscr], - [ncurses=ncursesw], - [ncurses=ncurses]) fi -AC_CHECK_LIB([$ncurses], - [initscr], - [LIBS="$LIBS -l$ncurses"], - [AC_MSG_ERROR($ncurses library is required)]) - -if test "x$ncurses" = "xncursesw"; then - AC_CHECK_HEADER([ncursesw/ncurses.h], - AC_DEFINE([HAVE_NCURSESW_NCURSES_H], [1], [ncursesw/ncurses.h]), - ,) -fi - - -dnl wide character support II - -if test "x$enable_wide" = "xauto" ; then - AC_CHECK_LIB([$ncurses], - [wget_wch], - [enable_wide=yes], - [enable_wide=no]) -fi - -AC_MSG_CHECKING([wide character support]) -AC_MSG_RESULT([$enable_wide]) - -if test "x$enable_wide" = "xyes" ; then - AC_DEFINE([ENABLE_WIDE], [1], [Enable wide character support]) -fi +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], + [], + [AC_CHECK_LIB([socket],[socket],[LIBS="$LIBS -lsocket"], + [AC_MSG_ERROR(No UNIX socket API found)]) + ]) + + AC_CHECK_FUNC([gethostbyname], + [], + [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$enable_wide = 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 @@ -191,16 +149,49 @@ 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_MSG_CHECKING([color support]) AC_ARG_ENABLE([colors], AS_HELP_STRING([--enable-colors], [Enable color support]),, - [enable_colors=$disable_mini]) -AC_MSG_RESULT([$enable_colors]) -if test "x$enable_colors" = "xyes" ; then - AC_DEFINE([ENABLE_COLORS], [1], [Enable color support]) -fi + [enable_colors=auto]) +AC_MSG_CHECKING([whether to include color support]) +AS_IF([ test "x$enable_colors" = xyes || test "x$enable_colors" = xauto ], + [AS_IF([ test "x$disable_mini" = xyes], + [AS_IF([ test "x$ax_cv_curses_color" = xyes ], + [AC_MSG_RESULT([yes]) + AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])], + [AS_IF([ test "x$enable_colors" = xyes ], + AC_MSG_ERROR(["No color support found in curses library"]) + AC_MSG_RESULT([no]), + AC_MSG_RESULT([no]) + ) + ]) + ], + [AC_MSG_RESULT([no]) + AC_MSG_WARN(["Colors disabled due to mini mode being enabled."])] + )], + [AC_MSG_RESULT([no])]) dnl test for LIRC support @@ -209,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 @@ -230,30 +225,35 @@ fi AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes) -dnl Optional screen - browse screen -#AC_MSG_CHECKING([whether to include the browse screen])r -#AC_ARG_ENABLE([browse-screen], -# AS_HELP_STRING([--enable-browse-screen], -# [Enable the browse screen @<:@default=yes@:>@]),, -# [enable_browse_screen=yes]) -#AC_MSG_RESULT([$enable_browse_screen]) -#if test "x$enable_browse_screen" = "xyes" ; then -# AC_DEFINE(ENABLE_BROWSE_SCREEN, 1, [Enable the browse screen]) -#fi - dnl Optional - curses getmouse support -AC_MSG_CHECKING([whether to include mouse support]) + +MPD_WITH_LIBRARY([CURSES], + [AC_CHECK_FUNC([getmouse], + [ax_cv_curses_mouse=yes], + [ax_cv_curses_mouse=no])]) + AC_ARG_ENABLE([mouse], - AS_HELP_STRING([--enable-mouse], + AS_HELP_STRING([--enable-mouse], [Enable curses getmouse support @<:@default=yes@:>@]),, - [enable_mouse=$disable_mini]) -AC_MSG_RESULT([$enable_mouse]) -if test "x$enable_mouse" = "xyes" ; then - AC_CHECK_LIB([$ncurses], - [getmouse], - [AC_DEFINE([HAVE_GETMOUSE], [1], [$ncurses - getmouse()])], - []) -fi + [enable_mouse=auto]) + +AC_MSG_CHECKING([whether to include mouse support]) + +AS_IF([ test "x$enable_mouse" = xyes || test "x$enable_mouse" = xauto ], + [AS_IF([ test "x$disable_mini" = xyes], + [AS_IF([ test "x$ax_cv_curses_mouse" = xyes ], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_GETMOUSE], [1], [Enable mouse support])], + [AC_MSG_RESULT([no]) + AS_IF([ test "x$enable_mouse" = xyes ], + [AC_MSG_ERROR(["No mouse support found in curses library"]) + ]) + ]) + ], + [AC_MSG_RESULT([no]) + AC_MSG_WARN("Mouse disabled due to mini mode being enabled.")] + )], + [AC_MSG_RESULT([no])]) dnl Optional screen - artist AC_MSG_CHECKING([whether to include the artist screen]) @@ -313,6 +313,14 @@ AC_ARG_ENABLE([lyrics-screen], AS_HELP_STRING([--enable-lyrics-screen], [Enable lyrics screen @<:@default=no@:>@]),, [enable_lyrics_screen=no]) + +case "$host_os" in +mingw32* | windows*) + AS_IF([ test "x$enable_lyrics_screen" = xyes ], + [AC_MSG_ERROR([Lyrics screen is not yet compatible with windows.]) + ]) +esac + if test "x$enable_lyrics_screen" = "xyes" ; then AC_DEFINE(ENABLE_LYRICS_SCREEN, 1, [Enable lyrics screen]) fi @@ -338,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]) @@ -346,12 +353,40 @@ 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 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 @@ -359,20 +394,25 @@ 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 - CHECK_CFLAG([-Werror]) + AX_APPEND_COMPILE_FLAGS([-Werror]) 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, @@ -382,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 @@ -389,15 +447,19 @@ dnl AC_SUBST(AM_CFLAGS) -CHECK_CFLAG([-Wall]) -CHECK_CFLAG([-Wextra]) -CHECK_CFLAG([-Wno-deprecated-declarations]) -CHECK_CFLAG([-Wmissing-prototypes]) -CHECK_CFLAG([-Wshadow]) -CHECK_CFLAG([-Wpointer-arith]) -CHECK_CFLAG([-Wstrict-prototypes]) -CHECK_CFLAG([-Wcast-qual]) -CHECK_CFLAG([-Wwrite-strings]) +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]) +AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes]) +AX_APPEND_COMPILE_FLAGS([-Wshadow]) +AX_APPEND_COMPILE_FLAGS([-Wpointer-arith]) +AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes]) +AX_APPEND_COMPILE_FLAGS([-Wcast-qual]) +AX_APPEND_COMPILE_FLAGS([-Wwrite-strings]) dnl @@ -405,4 +467,4 @@ dnl Generate output files dnl AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile]) -AC_OUTPUT +AC_OUTPUT(doc/doxygen.conf)