X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=efb6e22bc2944a7627f5cb237a5fdaa0adb142d2;hb=fe63646351309883cd2c61eb12be475ce8979764;hp=cb3633bce98d91e709edb8dae9f55551c35d62a8;hpb=d65045c3f80d175b7da2540ba6290c4de22acd9a;p=ncmpc.git diff --git a/configure.ac b/configure.ac index cb3633b..efb6e22 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.60) -AC_INIT(ncmpc, 0.19~git, max@duempel.org) +AC_INIT(ncmpc, 0.20~git, 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 @@ -43,39 +43,40 @@ else 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], - AC_HELP_STRING([--enable-wide], + AS_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] ), + AS_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@:>@]), + AS_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]), [ncurses=ncursesw]) if test "x$enable_wide" = "xno"; then @@ -127,7 +128,7 @@ fi dnl multi-byte character support AC_ARG_ENABLE([multibyte], - AC_HELP_STRING([--disable-multibyte], + AS_HELP_STRING([--disable-multibyte], [Disable multibyte character support (default: enabled)]),, [enable_multibyte=$disable_mini]) @@ -139,19 +140,19 @@ else 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], + AS_HELP_STRING([--disable-locale], [Disable locale support (default: auto)]),, [enable_locale=$auto_mini]) @@ -194,7 +195,7 @@ fi dnl enable colors AC_MSG_CHECKING([color support]) AC_ARG_ENABLE([colors], - AC_HELP_STRING([--enable-colors], + AS_HELP_STRING([--enable-colors], [Enable color support]),, [enable_colors=$disable_mini]) AC_MSG_RESULT([$enable_colors]) @@ -205,7 +206,7 @@ fi 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 @@ -230,21 +231,10 @@ 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], -# 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]) AC_ARG_ENABLE([mouse], - AC_HELP_STRING([--enable-mouse], + AS_HELP_STRING([--enable-mouse], [Enable curses getmouse support @<:@default=yes@:>@]),, [enable_mouse=$disable_mini]) AC_MSG_RESULT([$enable_mouse]) @@ -258,7 +248,7 @@ fi 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]) @@ -271,7 +261,7 @@ 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], + AS_HELP_STRING([--enable-search-screen], [Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),, [enable_search_screen=$disable_mini]) AC_MSG_RESULT([$enable_search_screen]) @@ -284,7 +274,7 @@ 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], + AS_HELP_STRING([--enable-song-screen], [Enable song viewer screen @<:@default=yes@:>@]),, [enable_song_screen=$disable_mini]) AC_MSG_RESULT([$enable_song_screen]) @@ -297,7 +287,7 @@ 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], + AS_HELP_STRING([--enable-key-screen], [Enable key editor screen @<:@default=yes@:>@]),, [enable_key_screen=$disable_mini]) AC_MSG_RESULT([$enable_key_screen]) @@ -310,7 +300,7 @@ 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], + AS_HELP_STRING([--enable-lyrics-screen], [Enable lyrics screen @<:@default=no@:>@]),, [enable_lyrics_screen=no]) if test "x$enable_lyrics_screen" = "xyes" ; then @@ -322,7 +312,7 @@ AM_CONDITIONAL(ENABLE_LYRICS_SCREEN, test x$enable_lyrics_screen = xyes) 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=""]) @@ -343,7 +333,7 @@ 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], + AS_HELP_STRING([--enable-outputs-screen], [Enable outputs screen @<:@default=yes@:>@]),, [enable_outputs_screen=$disable_mini]) if test "x$enable_outputs_screen" = "xyes" ; then @@ -351,6 +341,8 @@ if test "x$enable_outputs_screen" = "xyes" ; then fi AM_CONDITIONAL(ENABLE_OUTPUTS_SCREEN, test x$enable_outputs_screen = xyes) +AC_MSG_RESULT([$enable_outputs_screen]) + dnl @@ -363,7 +355,7 @@ AC_ARG_ENABLE(werror, enable_werror=no) if test "x$enable_werror" = xyes; then - AM_CFLAGS="$AM_CFLAGS -Werror" + CHECK_CFLAG([-Werror]) fi AC_ARG_ENABLE(debug,