X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=a1ea65a342c34500f9296730a3a83c3b87e1d9ab;hb=c9f9f3f9e2f1febb6038489fcc99d0d9e957a1bb;hp=1935b1b599dc5be512dd8f31ab006eaad8845db5;hpb=676828ad010959b186ec3094653b881369aebffa;p=ncmpc.git diff --git a/configure.ac b/configure.ac index 1935b1b..a1ea65a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(ncmpc, 0.20~git, max@duempel.org) +AC_INIT(ncmpc, 0.20, max@duempel.org) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_AUX_DIR(build) AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects]) @@ -9,6 +9,11 @@ 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 @@ -26,7 +31,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,12 +40,10 @@ 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 AC_CANONICAL_HOST @@ -49,6 +52,7 @@ case "$host_os" in mingw32* | windows*) LIBS="$LIBS -lws2_32" ;; + *) AC_CHECK_FUNC([socket], [], @@ -63,79 +67,17 @@ mingw32* | windows*) ]) esac - -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 - 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 @@ -153,7 +95,7 @@ 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 @@ -193,15 +135,28 @@ else 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 color support]), + [enable_colors=$enableval], + [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 @@ -232,18 +187,36 @@ fi AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes) dnl Optional - curses getmouse support -AC_MSG_CHECKING([whether to include mouse 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], + [ax_cv_curses_mouse=yes], + [ax_cv_curses_mouse=no]) + AC_ARG_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 + AS_HELP_STRING([--enable-mouse], + [Enable curses getmouse support @<:@default=yes@:>@]), + [enable_mouse=$enableval], + [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]) @@ -301,8 +274,17 @@ 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 @<:@default=no@:>@]), + [enable_lyrics_screen=$enableval], [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 @@ -336,6 +318,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 @@ -351,7 +334,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 @@ -360,7 +343,7 @@ 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 @@ -374,6 +357,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 @@ -397,4 +398,4 @@ dnl Generate output files dnl AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile]) -AC_OUTPUT +AC_OUTPUT(doc/doxygen.conf)