![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index cb3633bce98d91e709edb8dae9f55551c35d62a8..a1ea65a342c34500f9296730a3a83c3b87e1d9ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.19~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])
-AM_CONFIG_HEADER([config.h])
+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
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)
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
-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],
- AC_HELP_STRING([--enable-wide],
- [Enable wide character support]),,
- [enable_wide=auto])
-
-
-dnl ncurses
-AC_ARG_WITH([ncurses],
- AC_HELP_STRING([--with-ncurses], [compile/link with ncurses library] ),
- [ncurses=ncurses])
-AC_ARG_WITH(ncursesw,
- AC_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
+case "$host_os" in
+mingw32* | windows*)
+ LIBS="$LIBS -lws2_32"
+ ;;
-if test "x$ncurses" = "xauto"; then
- AC_CHECK_LIB([ncursesw],
- [initscr],
- [ncurses=ncursesw],
- [ncurses=ncurses])
-fi
+*)
+ AC_CHECK_FUNC([socket],
+ [],
+ [AC_CHECK_LIB([socket],[socket],[LIBS="$LIBS -lsocket"],
+ [AC_MSG_ERROR(No UNIX socket API found)])
+ ])
-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_CHECK_FUNC([gethostbyname],
+ [],
+ [AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
+ [AC_MSG_ERROR(No UNIX gethostbyname API found)])
+ ])
+esac
dnl multi-byte character support
AC_ARG_ENABLE([multibyte],
- AC_HELP_STRING([--disable-multibyte],
- [Disable multibyte character support (default: enabled)]),,
+ AS_HELP_STRING([--disable-multibyte],
+ [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.4
+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 libmpdclient 2.0
-PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.0],,
+dnl Check for libmpdclient 2.2
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.2],,
[AC_MSG_ERROR([libmpdclient2 is required])])
dnl i18n
AC_ARG_ENABLE([locale],
- AC_HELP_STRING([--disable-locale],
- [Disable locale support (default: auto)]),,
+ AS_HELP_STRING([--disable-locale],
+ [Disable locale support @<:@default=auto@:>@]),,
[enable_locale=$auto_mini])
if test x$enable_locale = xyes; then
fi
dnl enable colors
-AC_MSG_CHECKING([color support])
AC_ARG_ENABLE([colors],
- AC_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
+ AS_HELP_STRING([--enable-colors],
+ [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
AC_ARG_ENABLE([lirc],
- AC_HELP_STRING([--enable-lirc],
+ AS_HELP_STRING([--enable-lirc],
[Enable LIRC support]),,
[enable_lirc=no])
if test x$enable_lirc = xyes; then
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],
-# AC_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])
+
+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],
- AC_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])
AC_ARG_ENABLE([artist-screen],
- AC_HELP_STRING([--enable-artist-screen],
+ AS_HELP_STRING([--enable-artist-screen],
[Enable artist screen @<:@default=yes@:>@]),,
[enable_artist_screen=$disable_mini])
AC_MSG_RESULT([$enable_artist_screen])
dnl Optional screen - search
AC_MSG_CHECKING([whether to include the search screen])
AC_ARG_ENABLE([search-screen],
- AC_HELP_STRING([--enable-search-screen],
+ AS_HELP_STRING([--enable-search-screen],
[Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),,
[enable_search_screen=$disable_mini])
AC_MSG_RESULT([$enable_search_screen])
dnl Optional screen - song viewer
AC_MSG_CHECKING([whether to include the song viewer screen])
AC_ARG_ENABLE([song-screen],
- AC_HELP_STRING([--enable-song-screen],
+ AS_HELP_STRING([--enable-song-screen],
[Enable song viewer screen @<:@default=yes@:>@]),,
[enable_song_screen=$disable_mini])
AC_MSG_RESULT([$enable_song_screen])
dnl Optional screen - key editor
AC_MSG_CHECKING([whether to include the key editor screen])
AC_ARG_ENABLE([key-screen],
- AC_HELP_STRING([--enable-key-screen],
+ AS_HELP_STRING([--enable-key-screen],
[Enable key editor screen @<:@default=yes@:>@]),,
[enable_key_screen=$disable_mini])
AC_MSG_RESULT([$enable_key_screen])
dnl Optional screen - lyrics
AC_MSG_CHECKING([whether to include the lyrics screen])
AC_ARG_ENABLE([lyrics-screen],
- AC_HELP_STRING([--enable-lyrics-screen],
- [Enable lyrics screen @<:@default=no@:>@]),,
+ AS_HELP_STRING([--enable-lyrics-screen],
+ [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
AC_MSG_RESULT([$enable_lyrics_screen])
AC_ARG_WITH([lyrics-plugin-dir],
- AC_HELP_STRING([[--with-lyrics-plugin-dir[=DIRECTORY]]],
+ AS_HELP_STRING([[--with-lyrics-plugin-dir[=DIRECTORY]]],
[Directory where lyrics plugins are stored @<:@default=PREFIX/lib/ncmpc/lyrics@:>@]),
[lyrics_plugin_dir=$withval],
[lyrics_plugin_dir=""])
dnl Optional screen - outputs
AC_MSG_CHECKING([whether to include the outputs screen])
AC_ARG_ENABLE([outputs-screen],
- AC_HELP_STRING([--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
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
- AM_CFLAGS="$AM_CFLAGS -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_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
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([-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
dnl
AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile])
-AC_OUTPUT
+AC_OUTPUT(doc/doxygen.conf)