![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.ac b/configure.ac
index 4aadbeb0b14d6e3e10b7aa1d52880d86e953a6a5..0e6957f822ca5d486a5d14a88b46bf872f90474f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_INIT
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE(ncmpc, 0.11.0-svn-20040630)
+AM_INIT_AUTOMAKE([ncmpc], [0.11.2-svn])
AM_CONFIG_HEADER([config.h])
dnl Check for programs
dnl =======================================================
dnl i18n
-ALL_LINGUAS="sv"
+ALL_LINGUAS="es de fr gl no ru sv"
set -- $CFLAGS
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)])
+ ])
+
+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)])
+ ])
+
+
dnl ncurses
-AC_CHECK_LIB([ncurses],
+ncurses=auto
+AC_ARG_WITH([ncurses],
+ AC_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@:>@]),
+ [ncurses=ncursesw])
+
+if test "x$ncurses" = "xauto"; then
+ AC_CHECK_LIB([ncursesw],
+ [initscr],
+ [ncurses=ncursesw],
+ [ncurses=ncurses])
+fi
+
+
+AC_CHECK_LIB([$ncurses],
[initscr],
- [LIBS="$LIBS -lncurses"],
- [AC_MSG_ERROR(ncurses library is required)])
+ [LIBS="$LIBS -l$ncurses"],
+ [AC_MSG_ERROR($ncurses library is required)])
+
+
+if test "x$ncurses" = "xncursesw" ; then
+ AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [wide-char wget_ch()])
+ AC_DEFINE(USE_NCURSESW, 1, [use wide-char ncurses library])
+fi
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!]))
+ [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]))
+ [nls=no],
+ [AC_MSG_ERROR([glib-2.2 is required])])
fi
["${GETTEXT_PACKAGE}"],
[gettext domain])
nls=$gt_cv_have_gettext
+ if test "x$nls" != "xyes"; then
+ AC_MSG_WARN([NLS support disabled!])
+ fi
else
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 Debugging
AC_MSG_CHECKING([whether to build with debug support])
AC_ARG_ENABLE([debug],
# 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],
+ [Enable curses getmouse support @<:@default=yes@:>@]),
+ [getmouse="$enableval"],
+ [getmouse=yes])
+AC_MSG_RESULT([$getmouse])
+if test "x$getmouse" = "xyes" ; then
+ AC_CHECK_LIB([$ncurses],
+ [getmouse],
+ [AC_DEFINE([HAVE_GETMOUSE], [1], [$ncurses - getmouse()])],
+ [])
+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],
+ [Enable artist screen (EXPERIMENTAL) @<:@default=no@:>@]),
+ [artist_screen="$enableval"],
+ [artist_screen=no])
+AC_MSG_RESULT([$artist_screen])
+if test "x$artist_screen" != "xyes" ; then
+ AC_DEFINE(DISABLE_ARTIST_SCREEN, 1, [Disable artist screen])
+fi
+
+dnl Optional screen - search
+AC_MSG_CHECKING([whether to include the search screen])
+AC_ARG_ENABLE([search-screen],
+ AC_HELP_STRING([--enable-search-screen],
+ [Enable search screen (EXPERIMENTAL) @<:@default=yes@:>@]),
+ [search_screen="$enableval"],
+ [search_screen=yes])
+AC_MSG_RESULT([$search_screen])
+if test "x$search_screen" != "xyes" ; then
+ AC_DEFINE(DISABLE_SEARCH_SCREEN, 1, [Disable search screen])
+fi
+
dnl Optional screen - key editor
AC_MSG_CHECKING([whether to include the key editor screen])
AC_ARG_ENABLE([key-screen],
[keydef_screen="$enableval"],
[keydef_screen=yes])
AC_MSG_RESULT([$keydef_screen])
-if test "x$keydef_screen" = "xyes" ; then
- AC_DEFINE(ENABLE_KEYDEF_SCREEN, 1, [Enable key editor screen])
+if test "x$keydef_screen" != "xyes" ; then
+ AC_DEFINE(DISABLE_KEYDEF_SCREEN, 1, [Disable key editor screen])
fi
dnl Optional screen - clock
AC_MSG_CHECKING([whether to include the clock screen])
AC_ARG_ENABLE([clock-screen],
AC_HELP_STRING([--enable-clock-screen],
- [Enable clock screen @<:@default=no@:>@]),
+ [Enable clock screen @<:@default=yes@:>@]),
[clock_screen="$enableval"],
- [clock_screen=no])
+ [clock_screen=yes])
AC_MSG_RESULT([$clock_screen])
-if test "x$clock_screen" = "xyes" ; then
- AC_DEFINE(ENABLE_CLOCK_SCREEN, 1, [Enable clock screen])
+if test "x$clock_screen" != "xyes" ; then
+ AC_DEFINE(DISABLE_CLOCK_SCREEN, 1, [Disable clock screen])
fi
dnl Default host
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])
AC_OUTPUT