diff --git a/configure.ac b/configure.ac
index 4aa392e5008a1674d4f80840934e947ca2b29269..d46045fc5e004c446d67ec40e39558d068e552f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_INIT(ncurses MPD client, 0.12~git, max@duempel.org, ncmpc)
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([gnu 1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([gnu 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
])
+dnl wide character support
+AC_ARG_ENABLE([wide],
+ AC_HELP_STRING([--enable-wide],
+ [Enable wide character support]),
+ [use_wide=$enableval],
+ [use_wide=auto])
+
+
dnl ncurses
ncurses=auto
AC_ARG_WITH([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$use_wide" = "xauto" ; then
+ AC_CHECK_LIB([$ncurses],
+ [wget_wch],
+ [use_wide=yes],
+ [use_wide=no])
+fi
+
+AC_MSG_CHECKING([wide character support])
+AC_MSG_RESULT([$use_wide])
+
+if test "x$use_wide" = "xyes" ; then
+ AC_DEFINE([ENABLE_WIDE], [1], [Enable wide character support])
+fi
dnl Check for glib-2.4
AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])
fi
+dnl test for LIRC support
+AC_CHECK_LIB(lirc_client, lirc_init)
+AC_SUBST(LIRC_LIBS)
+AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
+
dnl Debugging
AC_MSG_CHECKING([whether to build with debug support])
AC_ARG_ENABLE([debug],