![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index 83a47a7d11311d22917fa71630afb61bbd66df11..f4a9a7da0c93c99ce0df436368988dbb9bd0f4e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
-dnl
-dnl $Id$
-dnl
-
-AC_INIT(ncurses MPD client, 0.12~git, max@duempel.org, ncmpc)
+AC_PREREQ(2.60)
+AC_INIT(ncurses MPD client, 0.12~alpha1, max@duempel.org, ncmpc)
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([gnu 1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
dnl Check for programs
AC_PROG_CC_C99
AC_PROG_INSTALL
-AC_PROG_LIBTOOL
dnl =======================================================
dnl initialize variables
set -- $CFLAGS
-dnl
-dnl Check for types
-dnl
-
-AC_MSG_RESULT([$ac_have_socklen_t])
-
dnl
dnl Check for headers
dnl
-AC_CHECK_HEADER([libgen.h],
- AC_DEFINE([HAVE_LIBGEN_H], [1], [glibc - libgen.h]),
- ,)
-
AC_CHECK_HEADER([locale.h],
AC_DEFINE([HAVE_LOCALE_H], [1], [locale.h]),
,)
AC_CHECK_FUNCS([strcasestr])
+dnl
+dnl ncmpc-mini
+dnl
+
+AC_ARG_ENABLE(mini,
+ AS_HELP_STRING([--enable-mini],
+ [Build ncmpc-mini (default: disabled)]),
+ [enable_mini=$enableval],
+ [enable_mini=no])
+
+AM_CONDITIONAL(NCMPC_MINI, test x$enable_mini = xyes)
+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
+ ncurses=ncurses
+else
+ auto=auto
+ disable_mini=yes
+ ncurses=auto
+fi
+
+
dnl
dnl Check for libraries
dnl
])
+dnl wide character support
+AC_ARG_ENABLE([wide],
+ AC_HELP_STRING([--enable-wide],
+ [Enable wide character support]),
+ [enable_wide=$enableval],
+ [enable_wide=auto])
+
+
dnl ncurses
-ncurses=auto
AC_ARG_WITH([ncurses],
AC_HELP_STRING([--with-ncurses], [compile/link with ncurses library] ),
[ncurses=ncurses])
AC_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]),
[ncurses=ncursesw])
+if test "x$enable_wide" = "xno"; then
+ if test "x$ncurses" = "xauto"; then
+ dnl select narrow ncurses
+ ncurses=ncurses
+ fi
+
+ if test "x$ncurses" = "xncursesw"; then
+ AC_MSG_WARN([Narrow ncmpc linking against wide libncurses])
+ fi
+fi
+
if test "x$ncurses" = "xauto"; then
AC_CHECK_LIB([ncursesw],
[initscr],
[LIBS="$LIBS -l$ncurses"],
[AC_MSG_ERROR($ncurses library is required)])
+if test "x$ncurses" = "xncursesw"; then
+ AC_CHECK_HEADER([ncursesw/ncurses.h],
+ AC_DEFINE([HAVE_NCURSESW_NCURSES_H], [1], [ncursesw/ncurses.h]),
+ ,)
+fi
+
+
+dnl wide character support II
+
+if test "x$enable_wide" = "xauto" ; then
+ AC_CHECK_LIB([$ncurses],
+ [wget_wch],
+ [enable_wide=yes],
+ [enable_wide=no])
+fi
+
+AC_MSG_CHECKING([wide character support])
+AC_MSG_RESULT([$enable_wide])
+
+if test "x$enable_wide" = "xyes" ; then
+ AC_DEFINE([ENABLE_WIDE], [1], [Enable wide character support])
+fi
dnl Check for glib-2.4
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])
+
+if test "x$enable_nls" = xno; then
+ glib24=no
+ nls=no
+fi
+
AM_NLS
if test "x$glib24" = "xyes"; then
nls=$USE_NLS
AM_PO_SUBDIRS
fi
-dnl disbale raw mode
-AC_MSG_CHECKING([Place the terminal into raw mode])
-AC_ARG_ENABLE([raw-mode],
- AC_HELP_STRING([--disable-raw-mode],
- [Disable raw terminal mode]),
- [use_raw=$enableval],
- [use_raw=yes])
-AC_MSG_RESULT([$use_raw])
-if test "x$use_raw" = "xyes" ; then
- AC_DEFINE([ENABLE_RAW_MODE], [1], [Place the terminal into raw mode])
-fi
-
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=no])
+ [use_colors=yes])
AC_MSG_RESULT([$use_colors])
if test "x$use_colors" = "xyes" ; then
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],
+ [enable_lirc=no])
+if test x$enable_lirc = xyes; then
+ PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+ [AC_MSG_ERROR([liblircclient0 not found])])
+ AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
+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],
CHECK_CFLAG([-Wwrite-strings])
dnl Optional screen - help screen
-#AC_MSG_CHECKING([whether to include the help screen])
-#AC_ARG_ENABLE([help-screen],
-# AC_HELP_STRING([--enable-help-screen],
-# [Enable the help screen @<:@default=yes@:>@]),
-# [help_screen="$enableval"],
-# [help_screen=yes])
-#AC_MSG_RESULT([$help_screen])
-#if test "x$help_screen" = "xyes" ; then
-# AC_DEFINE(ENABLE_HELP_SCREEN, 1, [Enable the help screen])
-#fi
+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
+ 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_HELP_STRING([--enable-mouse],
[Enable curses getmouse support @<:@default=yes@:>@]),
[getmouse="$enableval"],
- [getmouse=yes])
+ [getmouse=$disable_mini])
AC_MSG_RESULT([$getmouse])
if test "x$getmouse" = "xyes" ; then
AC_CHECK_LIB([$ncurses],
AC_MSG_CHECKING([whether to include the artist screen])
AC_ARG_ENABLE([artist-screen],
AC_HELP_STRING([--enable-artist-screen],
- [Enable artist screen (EXPERIMENTAL) @<:@default=no@:>@]),
+ [Enable artist screen @<:@default=no@:>@]),
[artist_screen="$enableval"],
- [artist_screen=no])
+ [artist_screen=yes])
AC_MSG_RESULT([$artist_screen])
if test "x$artist_screen" = "xyes" ; then
AC_DEFINE(ENABLE_ARTIST_SCREEN, 1, [Enable artist screen])
AC_HELP_STRING([--enable-search-screen],
[Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),
[search_screen="$enableval"],
- [search_screen=yes])
+ [search_screen=$disable_mini])
AC_MSG_RESULT([$search_screen])
if test "x$search_screen" = "xyes" ; then
AC_DEFINE(ENABLE_SEARCH_SCREEN, 1, [Enable search screen])
AC_HELP_STRING([--enable-key-screen],
[Enable key editor screen @<:@default=yes@:>@]),
[keydef_screen="$enableval"],
- [keydef_screen=yes])
+ [keydef_screen=$disable_mini])
AC_MSG_RESULT([$keydef_screen])
if test "x$keydef_screen" = "xyes" ; then
AC_DEFINE(ENABLE_KEYDEF_SCREEN, 1, [Enable key editor screen])