![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index 4e97c99738df6606e1818a6928a500d1a176f8d5..92b46c3e972cf58c23193cf62466080e43344383 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.60)
-AC_INIT(ncurses MPD client, 0.13~git, max@duempel.org, ncmpc)
+AC_INIT(ncmpc, 0.16~git, max@duempel.org)
AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_AUX_DIR(build)
AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
dnl =======================================================
dnl i18n
-ALL_LINGUAS="es da de fr gl no ru sk sv hu"
+ALL_LINGUAS=`grep -v '^\#' po/LINGUAS`
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
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])
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
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.4 is required])])
+
+dnl Check for libmpdclient 2.0
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.0],,
+ [AC_MSG_ERROR([libmpdclient2 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
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])
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'])
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in po/Makefile])
+
+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 po/Makefile.in po/Makefile])
AC_OUTPUT