X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=7891686619952363389618ca19ba62c86c546807;hb=5aa9a4164d4d9b70aab1c338088cdf3d7be76cdb;hp=24ed5037ff59d791d6f9cb6ab1e40d2afa4206c7;hpb=b89e0800641b77b490b695121b5cbf8bcacecfa6;p=ncmpc.git diff --git a/configure.ac b/configure.ac index 24ed503..7891686 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.60) -AC_INIT(ncmpc, 0.13~git, max@duempel.org) +AC_INIT(ncmpc, 0.17, max@duempel.org) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_AUX_DIR(build) -AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) +AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -15,7 +15,7 @@ dnl initialize variables dnl ======================================================= dnl i18n -ALL_LINGUAS="es da de fr gl no ru sk sv hu" +ALL_LINGUAS=`grep -v '^\#' po/LINGUAS` set -- $CFLAGS @@ -26,8 +26,7 @@ dnl 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) @@ -67,8 +66,7 @@ AC_CHECK_FUNC([gethostbyname], dnl wide character support AC_ARG_ENABLE([wide], AC_HELP_STRING([--enable-wide], - [Enable wide character support]), - [enable_wide=$enableval], + [Enable wide character support]),, [enable_wide=auto]) @@ -130,8 +128,7 @@ dnl multi-byte character support AC_ARG_ENABLE([multibyte], AC_HELP_STRING([--disable-multibyte], - [Disable multibyte character support (default: enabled)]), - [enable_multibyte=$enableval], + [Disable multibyte character support (default: enabled)]),, [enable_multibyte=$disable_mini]) if test x$enable_multibyte = xyes; then @@ -143,16 +140,19 @@ else fi dnl Check for glib-2.4 -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],, - [AC_MSG_ERROR([glib 2.4 is required])]) +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],, + [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], + [Disable locale support (default: auto)]),, [enable_locale=$auto_mini]) if test x$enable_locale = xyes; then @@ -195,11 +195,10 @@ 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 + [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 @@ -207,8 +206,7 @@ dnl test for LIRC support AC_ARG_ENABLE([lirc], AC_HELP_STRING([--enable-lirc], - [Enable LIRC support]), - [enable_lirc=$enableval], + [Enable LIRC support]),, [enable_lirc=no]) if test x$enable_lirc = xyes; then PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],, @@ -223,25 +221,23 @@ dnl Optional screen - 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 -AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$help_screen = xyes) +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@:>@]), -# [browse_screen="$enableval"], -# [browse_screen=yes]) -#AC_MSG_RESULT([$browse_screen]) -#if test "x$browse_screen" = "xyes" ; then +# [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 @@ -249,11 +245,10 @@ 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 + [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()])], @@ -264,72 +259,67 @@ 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 + [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 -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], 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 + [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 -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], 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 + [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 -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], 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 + [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 -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], AC_HELP_STRING([--enable-lyrics-screen], - [Enable lyrics screen @<:@default=no@:>@]), - [lyrics_screen="$enableval"], - [lyrics_screen=no]) -if test "x$lyrics_screen" = "xyes" ; then + [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 -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_HELP_STRING([[--with-lyrics-plugin-dir[=DIRECTORY]]], @@ -347,52 +337,20 @@ AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$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], 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 + [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$outputs_screen = xyes) - -dnl Default host -AC_MSG_CHECKING([for default MPD host]) -AC_ARG_WITH([default-host], - AC_HELP_STRING([--with-default-host=ARG], - [Default MPD host @<:@localhost@:>@]), - [DEFAULT_HOST="$withval"], - [DEFAULT_HOST="localhost"]) -AC_MSG_RESULT([$DEFAULT_HOST]) -AC_DEFINE_UNQUOTED([DEFAULT_HOST], ["$DEFAULT_HOST"], [Default MPD host]) - -dnl Default port -AC_MSG_CHECKING([for default MPD port]) -AC_ARG_WITH([default-port], - AC_HELP_STRING([--with-default-port=ARG], - [Default port @<:@6600@:>@]), - [DEFAULT_PORT="$withval"], - [DEFAULT_PORT="6600"]) -AC_MSG_RESULT([$DEFAULT_PORT]) -AC_DEFINE_UNQUOTED([DEFAULT_PORT], [$DEFAULT_PORT], [Default MPD port]) -AC_DEFINE_UNQUOTED([DEFAULT_PORT_STR], ["$DEFAULT_PORT"], [Default MPD port]) - -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']) +AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$enable_outputs_screen = xyes) dnl @@ -401,24 +359,29 @@ dnl 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 +if test "x$enable_werror" = xyes; then AM_CFLAGS="$AM_CFLAGS -Werror" 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 +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 @@ -430,7 +393,6 @@ CHECK_CFLAG([-Wall]) 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]) @@ -442,5 +404,5 @@ dnl dnl Generate output files dnl -AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in po/Makefile]) +AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile]) AC_OUTPUT