diff --git a/configure.ac b/configure.ac
index 5bc8531c31a0a2de6511f84a4e1979143bb207ab..efb6e22bc2944a7627f5cb237a5fdaa0adb142d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.60)
AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.16~git, max@duempel.org)
+AC_INIT(ncmpc, 0.20~git, max@duempel.org)
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR(build)
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
dnl Check for programs
AC_CONFIG_MACRO_DIR([m4])
dnl Check for programs
AC_ARG_ENABLE(mini,
AS_HELP_STRING([--enable-mini],
AC_ARG_ENABLE(mini,
AS_HELP_STRING([--enable-mini],
- [Build ncmpc-mini, i.e. without all optional features (default: disabled)]),
- [enable_mini=$enableval],
+ [Build ncmpc-mini, i.e. without all optional features (default: disabled)]),,
[enable_mini=no])
AM_CONDITIONAL(NCMPC_MINI, test x$enable_mini = xyes)
[enable_mini=no])
AM_CONDITIONAL(NCMPC_MINI, test x$enable_mini = xyes)
ncurses=auto
fi
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)])
- ])
+case "$host_os" in
+mingw32* | windows*)
+ LIBS="$LIBS -lws2_32"
+ ;;
+*)
+ 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)])
- ])
+ AC_CHECK_FUNC([gethostbyname],
+ [],
+ [AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
+ [AC_MSG_ERROR(No UNIX gethostbyname API found)])
+ ])
+esac
dnl wide character support
AC_ARG_ENABLE([wide],
dnl wide character support
AC_ARG_ENABLE([wide],
- AC_HELP_STRING([--enable-wide],
- [Enable wide character support]),
- [enable_wide=$enableval],
+ AS_HELP_STRING([--enable-wide],
+ [Enable wide character support]),,
[enable_wide=auto])
dnl ncurses
AC_ARG_WITH([ncurses],
[enable_wide=auto])
dnl ncurses
AC_ARG_WITH([ncurses],
- AC_HELP_STRING([--with-ncurses], [compile/link with ncurses library] ),
+ AS_HELP_STRING([--with-ncurses], [compile/link with ncurses library] ),
[ncurses=ncurses])
AC_ARG_WITH(ncursesw,
[ncurses=ncurses])
AC_ARG_WITH(ncursesw,
- AC_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]),
+ AS_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]),
[ncurses=ncursesw])
if test "x$enable_wide" = "xno"; then
[ncurses=ncursesw])
if test "x$enable_wide" = "xno"; then
dnl multi-byte character support
AC_ARG_ENABLE([multibyte],
dnl multi-byte character support
AC_ARG_ENABLE([multibyte],
- AC_HELP_STRING([--disable-multibyte],
- [Disable multibyte character support (default: enabled)]),
- [enable_multibyte=$enableval],
+ AS_HELP_STRING([--disable-multibyte],
+ [Disable multibyte character support (default: enabled)]),,
[enable_multibyte=$disable_mini])
if test x$enable_multibyte = xyes; then
[enable_multibyte=$disable_mini])
if test x$enable_multibyte = xyes; then
fi
fi
fi
fi
-dnl Check for glib-2.4
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
- [AC_MSG_ERROR([glib 2.4 is required])])
+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_MSG_ERROR([libmpdclient2 is required])])
dnl i18n
AC_ARG_ENABLE([locale],
- AC_HELP_STRING([--disable-locale],
- [Disable locale support (default: auto)]),
- [enable_locale=$enableval],
+ AS_HELP_STRING([--disable-locale],
+ [Disable locale support (default: auto)]),,
[enable_locale=$auto_mini])
if test x$enable_locale = xyes; then
[enable_locale=$auto_mini])
if test x$enable_locale = xyes; then
dnl enable colors
AC_MSG_CHECKING([color support])
AC_ARG_ENABLE([colors],
dnl enable colors
AC_MSG_CHECKING([color support])
AC_ARG_ENABLE([colors],
- AC_HELP_STRING([--enable-colors],
- [Enable color support]),
- [use_colors=$enableval],
- [use_colors=$disable_mini])
-AC_MSG_RESULT([$use_colors])
-if test "x$use_colors" = "xyes" ; then
+ 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
dnl test for LIRC support
AC_ARG_ENABLE([lirc],
AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])
fi
dnl test for LIRC support
AC_ARG_ENABLE([lirc],
- AC_HELP_STRING([--enable-lirc],
- [Enable LIRC support]),
- [enable_lirc=$enableval],
+ AS_HELP_STRING([--enable-lirc],
+ [Enable LIRC support]),,
[enable_lirc=no])
if test x$enable_lirc = xyes; then
PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
[enable_lirc=no])
if test x$enable_lirc = xyes; then
PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
AC_MSG_CHECKING([whether to include the help screen])
AC_ARG_ENABLE([help-screen],
AS_HELP_STRING([--enable-help-screen],
AC_MSG_CHECKING([whether to include the help screen])
AC_ARG_ENABLE([help-screen],
AS_HELP_STRING([--enable-help-screen],
- [Enable the help screen @<:@default=yes@:>@]),
- [help_screen="$enableval"],
- [help_screen=$disable_mini])
-AC_MSG_RESULT([$help_screen])
-if test "x$help_screen" = "xyes" ; then
+ [Enable the help screen @<:@default=yes@:>@]),,
+ [enable_help_screen=$disable_mini])
+AC_MSG_RESULT([$enable_help_screen])
+if test "x$enable_help_screen" = "xyes" ; then
AC_DEFINE(ENABLE_HELP_SCREEN, 1, [Enable the help screen])
fi
AC_DEFINE(ENABLE_HELP_SCREEN, 1, [Enable the help screen])
fi
-AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$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@:>@]),
-# [browse_screen="$enableval"],
-# [browse_screen=yes])
-#AC_MSG_RESULT([$browse_screen])
-#if test "x$browse_screen" = "xyes" ; then
-# AC_DEFINE(ENABLE_BROWSE_SCREEN, 1, [Enable the browse screen])
-#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])
AC_ARG_ENABLE([mouse],
dnl Optional - curses getmouse support
AC_MSG_CHECKING([whether to include mouse support])
AC_ARG_ENABLE([mouse],
- AC_HELP_STRING([--enable-mouse],
- [Enable curses getmouse support @<:@default=yes@:>@]),
- [getmouse="$enableval"],
- [getmouse=$disable_mini])
-AC_MSG_RESULT([$getmouse])
-if test "x$getmouse" = "xyes" ; then
+ 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()])],
AC_CHECK_LIB([$ncurses],
[getmouse],
[AC_DEFINE([HAVE_GETMOUSE], [1], [$ncurses - getmouse()])],
dnl Optional screen - artist
AC_MSG_CHECKING([whether to include the artist screen])
AC_ARG_ENABLE([artist-screen],
dnl Optional screen - artist
AC_MSG_CHECKING([whether to include the artist screen])
AC_ARG_ENABLE([artist-screen],
- AC_HELP_STRING([--enable-artist-screen],
- [Enable artist screen @<:@default=yes@:>@]),
- [artist_screen="$enableval"],
- [artist_screen=$disable_mini])
-AC_MSG_RESULT([$artist_screen])
-if test "x$artist_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-artist-screen],
+ [Enable artist screen @<:@default=yes@:>@]),,
+ [enable_artist_screen=$disable_mini])
+AC_MSG_RESULT([$enable_artist_screen])
+if test "x$enable_artist_screen" = "xyes" ; then
AC_DEFINE(ENABLE_ARTIST_SCREEN, 1, [Enable artist screen])
fi
AC_DEFINE(ENABLE_ARTIST_SCREEN, 1, [Enable artist screen])
fi
-AM_CONDITIONAL(ENABLE_ARTIST_SCREEN, test x$artist_screen = xyes)
+AM_CONDITIONAL(ENABLE_ARTIST_SCREEN, test x$enable_artist_screen = xyes)
dnl Optional screen - search
AC_MSG_CHECKING([whether to include the search screen])
AC_ARG_ENABLE([search-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],
- [Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),
- [search_screen="$enableval"],
- [search_screen=$disable_mini])
-AC_MSG_RESULT([$search_screen])
-if test "x$search_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-search-screen],
+ [Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),,
+ [enable_search_screen=$disable_mini])
+AC_MSG_RESULT([$enable_search_screen])
+if test "x$enable_search_screen" = "xyes" ; then
AC_DEFINE(ENABLE_SEARCH_SCREEN, 1, [Enable search screen])
fi
AC_DEFINE(ENABLE_SEARCH_SCREEN, 1, [Enable search screen])
fi
-AM_CONDITIONAL(ENABLE_SEARCH_SCREEN, test x$search_screen = xyes)
+AM_CONDITIONAL(ENABLE_SEARCH_SCREEN, test x$enable_search_screen = xyes)
dnl Optional screen - song viewer
AC_MSG_CHECKING([whether to include the song viewer screen])
AC_ARG_ENABLE([song-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],
- [Enable song viewer screen @<:@default=yes@:>@]),
- [song_screen="$enableval"],
- [song_screen=$disable_mini])
-AC_MSG_RESULT([$song_screen])
-if test "x$song_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-song-screen],
+ [Enable song viewer screen @<:@default=yes@:>@]),,
+ [enable_song_screen=$disable_mini])
+AC_MSG_RESULT([$enable_song_screen])
+if test "x$enable_song_screen" = "xyes" ; then
AC_DEFINE(ENABLE_SONG_SCREEN, 1, [Enable song viewer screen])
fi
AC_DEFINE(ENABLE_SONG_SCREEN, 1, [Enable song viewer screen])
fi
-AM_CONDITIONAL(ENABLE_SONG_SCREEN, test x$song_screen = xyes)
+AM_CONDITIONAL(ENABLE_SONG_SCREEN, test x$enable_song_screen = xyes)
dnl Optional screen - key editor
AC_MSG_CHECKING([whether to include the key editor screen])
AC_ARG_ENABLE([key-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],
- [Enable key editor screen @<:@default=yes@:>@]),
- [keydef_screen="$enableval"],
- [keydef_screen=$disable_mini])
-AC_MSG_RESULT([$keydef_screen])
-if test "x$keydef_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-key-screen],
+ [Enable key editor screen @<:@default=yes@:>@]),,
+ [enable_key_screen=$disable_mini])
+AC_MSG_RESULT([$enable_key_screen])
+if test "x$enable_key_screen" = "xyes" ; then
AC_DEFINE(ENABLE_KEYDEF_SCREEN, 1, [Enable key editor screen])
fi
AC_DEFINE(ENABLE_KEYDEF_SCREEN, 1, [Enable key editor screen])
fi
-AM_CONDITIONAL(ENABLE_KEYDEF_SCREEN, test x$keydef_screen = xyes)
+AM_CONDITIONAL(ENABLE_KEYDEF_SCREEN, test x$enable_key_screen = xyes)
dnl Optional screen - lyrics
AC_MSG_CHECKING([whether to include the lyrics screen])
AC_ARG_ENABLE([lyrics-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@:>@]),
- [lyrics_screen="$enableval"],
- [lyrics_screen=no])
-if test "x$lyrics_screen" = "xyes" ; then
+ AS_HELP_STRING([--enable-lyrics-screen],
+ [Enable lyrics screen @<:@default=no@:>@]),,
+ [enable_lyrics_screen=no])
+if test "x$enable_lyrics_screen" = "xyes" ; then
AC_DEFINE(ENABLE_LYRICS_SCREEN, 1, [Enable lyrics screen])
fi
AC_DEFINE(ENABLE_LYRICS_SCREEN, 1, [Enable lyrics screen])
fi
-AM_CONDITIONAL(ENABLE_LYRICS_SCREEN, test x$lyrics_screen = xyes)
+AM_CONDITIONAL(ENABLE_LYRICS_SCREEN, test x$enable_lyrics_screen = xyes)
-AC_MSG_RESULT([$lyrics_screen])
+AC_MSG_RESULT([$enable_lyrics_screen])
AC_ARG_WITH([lyrics-plugin-dir],
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=""])
[Directory where lyrics plugins are stored @<:@default=PREFIX/lib/ncmpc/lyrics@:>@]),
[lyrics_plugin_dir=$withval],
[lyrics_plugin_dir=""])
[Directory to search for lyrics plugins])
AC_SUBST(lyrics_plugin_dir)
[Directory to search for lyrics plugins])
AC_SUBST(lyrics_plugin_dir)
-AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$lyrics_screen = xyes)
-AM_CONDITIONAL(ENABLE_SCREEN_TEXT, test x$lyrics_screen = xyes)
+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])
AC_ARG_ENABLE([outputs-screen],
dnl Optional screen - outputs
AC_MSG_CHECKING([whether to include the outputs screen])
AC_ARG_ENABLE([outputs-screen],
- AC_HELP_STRING([--enable-outputs-screen],
- [Enable outputs screen @<:@default=yes@:>@]),
- [outputs_screen=$enableval],
- [outputs_screen=$disable_mini])
-if test "x$outputs_screen" = "xyes" ; then
+ 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
AC_DEFINE(ENABLE_OUTPUTS_SCREEN, 1, [Enable outputs screen])
fi
-AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$outputs_screen = xyes)
+AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$enable_outputs_screen = xyes)
+AC_MSG_RESULT([$enable_outputs_screen])
-dnl Default timedisplay type
-AC_MSG_CHECKING([for default timedisplay type])
-AC_ARG_WITH([default-timedisplay_type],
- AC_HELP_STRING([--with-default-timedisplay_type=ARG],
- [default_timedisplay]),
- [DEFAULT_TIMEDISPLAY_TYPE="$withval"],
- [DEFAULT_TIMEDISPLAY_TYPE="elapsed"])
-AC_MSG_RESULT([$DEFAULT_TIMEDISPLAY_TYPE])
-AC_DEFINE_UNQUOTED([DEFAULT_TIMEDISPLAY_TYPE], ["$DEFAULT_TIMEDISPLAY_TYPE"], [Default way to display time, either 'elapsed' or 'remaining'])
dnl
dnl
AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror],
AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror],
- [Treat warnings as errors (default: disabled)]),
- ENABLE_WERROR=$enableval,
- ENABLE_WERROR=no)
+ [Treat warnings as errors (default: disabled)]),,
+ enable_werror=no)
-if test "x$ENABLE_WERROR" = xyes; then
- AM_CFLAGS="$AM_CFLAGS -Werror"
+if test "x$enable_werror" = xyes; then
+ CHECK_CFLAG([-Werror])
fi
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
fi
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
- [Enable debugging (default: disabled)]),
- ENABLE_DEBUG=$enableval,
- ENABLE_DEBUG=no)
+ [Enable debugging (default: disabled)]),,
+ enable_debug=no)
-if test "x$ENABLE_DEBUG" = xno; then
+if test "x$enable_debug" = xno; then
AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
fi
AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
fi
+AC_ARG_ENABLE(test,
+ AS_HELP_STRING([--enable-test],
+ [build the test programs @<:@default=no@:>@]),,
+ enable_test=$enable_debug)
+
+AM_CONDITIONAL(ENABLE_TEST, test "x$enable_test" = xyes)
+
dnl
dnl CFLAGS
dnl
dnl CFLAGS
CHECK_CFLAG([-Wextra])
CHECK_CFLAG([-Wno-deprecated-declarations])
CHECK_CFLAG([-Wmissing-prototypes])
CHECK_CFLAG([-Wextra])
CHECK_CFLAG([-Wno-deprecated-declarations])
CHECK_CFLAG([-Wmissing-prototypes])
-CHECK_CFLAG([-Wdeclaration-after-statement])
CHECK_CFLAG([-Wshadow])
CHECK_CFLAG([-Wpointer-arith])
CHECK_CFLAG([-Wstrict-prototypes])
CHECK_CFLAG([-Wshadow])
CHECK_CFLAG([-Wpointer-arith])
CHECK_CFLAG([-Wstrict-prototypes])