X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=d9748b9472de4e567e0b1712ad2df4ff6a25cb25;hb=20cd751db12c400c98533c1b98fa984a9aecf9db;hp=1c141358746b19b135b503ca429457f2423f9799;hpb=041b59e39d320fff89e02a853cd162ba88b909cf;p=ncmpc.git diff --git a/configure.ac b/configure.ac index 1c14135..d9748b9 100644 --- a/configure.ac +++ b/configure.ac @@ -18,14 +18,6 @@ ALL_LINGUAS="es da de fr gl no ru sk sv hu" set -- $CFLAGS -dnl -dnl Check for headers -dnl - -AC_CHECK_HEADER([locale.h], - AC_DEFINE([HAVE_LOCALE_H], [1], [locale.h]), - ,) - dnl dnl ncmpc-mini @@ -33,7 +25,7 @@ dnl AC_ARG_ENABLE(mini, AS_HELP_STRING([--enable-mini], - [Build ncmpc-mini (default: disabled)]), + [Build ncmpc-mini, i.e. without all optional features (default: disabled)]), [enable_mini=$enableval], [enable_mini=no]) @@ -42,10 +34,12 @@ if test "x$enable_mini" = xyes; then AC_DEFINE([NCMPC_MINI], [1], [Build ncmpc-mini, which disables lots of features]) auto=no disable_mini=no + auto_mini=no ncurses=ncurses else auto=auto disable_mini=yes + auto_mini=auto ncurses=auto fi @@ -131,51 +125,65 @@ if test "x$enable_wide" = "xyes" ; then AC_DEFINE([ENABLE_WIDE], [1], [Enable wide character support]) fi +dnl multi-byte character support -dnl Check for glib-2.4 -PKG_CHECK_MODULES([GLIB], - [glib-2.0 >= 2.4], - [glib24=yes], - [AC_MSG_WARN([glib-2.4 is required for NLS support!])]) -if test "x$glib24" != "xyes"; then - PKG_CHECK_MODULES([GLIB], - [glib-2.0 >= 2.2], - [nls=no], - [AC_MSG_ERROR([glib-2.2 is required])]) +AC_ARG_ENABLE([multibyte], + AC_HELP_STRING([--disable-multibyte], + [Disable multibyte character support (default: enabled)]), + [enable_multibyte=$enableval], + [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 + AC_MSG_WARN(wide characters without multibyte characters makes little sense) + fi fi +dnl Check for glib-2.4 +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],, + [AC_MSG_ERROR([glib-2.2 is required])]) + dnl i18n -AC_MSG_CHECKING([national language support]) -AC_ARG_ENABLE([nls], - AS_HELP_STRING([--enable-nls], [Enable national language support]), - [enable_nls=$enableval], - [enable_nls=$disable_mini]) -AC_MSG_RESULT([$enable_nls]) +AC_ARG_ENABLE([locale], + AC_HELP_STRING([--disable-locale], + [Disable locale support (default: auto)]), + [enable_locale=$enableval], + [enable_locale=$auto_mini]) + +if test x$enable_locale = xyes; then + AC_CHECK_HEADER([locale.h],, + [AC_MSG_ERROR(locale.h is unavailable)]) +fi + +if test x$enable_locale = xauto; then + AC_CHECK_HEADER([locale.h], + [enable_locale=yes], + [enable_locale=no]) +fi -if test "x$enable_nls" = xno; then - glib24=no - nls=no +if test x$enable_locale = xyes; then + AC_DEFINE([ENABLE_LOCALE], [1], [Locale support is enabled]) fi -AM_NLS -if test "x$glib24" = "xyes"; then - nls=$USE_NLS +if test x$enable_mini != xyes; then + AM_NLS else - USE_NLS=no - AC_SUBST(USE_NLS) + USE_NLS=no fi -if test "x$nls" = "xyes"; then +if test x$USE_NLS = xyes; then AM_GLIB_GNU_GETTEXT GETTEXT_PACKAGE=$PACKAGE AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain]) - nls=$gt_cv_have_gettext - if test "x$nls" != "xyes"; then + USE_NLS=$gt_cv_have_gettext + if test x$USE_NLS != xyes; then AC_MSG_WARN([NLS support disabled!]) fi else @@ -209,34 +217,6 @@ fi AM_CONDITIONAL(ENABLE_LIRC, test x$enable_lirc = xyes) -dnl Debugging -AC_MSG_CHECKING([whether to build with debug support]) -AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [Enable debugging @<:@default=no@:>@]), - [enable_debug="$enableval"], - [enable_debug=no]) -AC_MSG_RESULT([$enable_debug]) -if test "x$enable_debug" = "xyes" ; then - CFLAGS="$CFLAGS -g" -else - CFLAGS="$CFLAGS -DNDEBUG" -fi - -dnl CFLAGS - -AC_SUBST(AM_CFLAGS) - -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]) -CHECK_CFLAG([-Wcast-qual]) -CHECK_CFLAG([-Wwrite-strings]) dnl Optional screen - help screen AC_MSG_CHECKING([whether to include the help screen]) @@ -283,7 +263,7 @@ 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=no@:>@]), + [Enable artist screen @<:@default=yes@:>@]), [artist_screen="$enableval"], [artist_screen=$disable_mini]) AC_MSG_RESULT([$artist_screen]) @@ -367,12 +347,13 @@ AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$lyrics_plugin_dir"], 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) 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=no@:>@]), + [Enable outputs screen @<:@default=yes@:>@]), [outputs_screen=$enableval], [outputs_screen=$disable_mini]) if test "x$outputs_screen" = "xyes" ; then @@ -411,5 +392,54 @@ AC_ARG_WITH([default-timedisplay_type], [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 build options +dnl + +AC_ARG_ENABLE(werror, + AS_HELP_STRING([--enable-werror], + [Treat warnings as errors (default: disabled)]), + ENABLE_WERROR=$enableval, + ENABLE_WERROR=no) + +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) + +if test "x$ENABLE_DEBUG" = xno; then + AM_CFLAGS="$AM_CFLAGS -DNDEBUG" +fi + + +dnl +dnl CFLAGS +dnl + +AC_SUBST(AM_CFLAGS) + +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]) +CHECK_CFLAG([-Wcast-qual]) +CHECK_CFLAG([-Wwrite-strings]) + + +dnl +dnl Generate output files +dnl + AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in po/Makefile]) AC_OUTPUT