diff --git a/configure.ac b/configure.ac
index 9c0fd9dfa9b42e3eb5344c92ef6b74a296d59b2a..ef9a617cdb2c88955167e5e086b31a4933c77a4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl $Id$
dnl
-AC_INIT
+AC_INIT(ncurses MPD client, 0.12~git, max@duempel.org, ncmpc)
AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([ncmpc], [0.12~git])
+AM_INIT_AUTOMAKE([gnu 1.6 dist-bzip2])
AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
dnl Check for programs
-AC_PROG_CC
+AC_PROG_CC_C99
AC_PROG_INSTALL
-dnl AC_PROG_LIBTOOL
AC_PROG_LIBTOOL
dnl =======================================================
AM_PO_SUBDIRS
fi
-dnl check for gthreads
-PKG_CHECK_MODULES([GTHREAD],
- [gthread-2.0],
- [gthread=yes],
- [AC_MSG_WARN([gthread-2.0 >= 0.20 is required the lyrics screen])])
-AC_SUBST(GTHREAD_LIBS)
-AC_SUBST(GTHREAD_CFLAGS)
-
-#if test "x$gthread-2.0" != "xyes"; then
-# PKG_CHECK_MODULES([GTHREAD],
-# [glib-2.0 >= 2.2],
-# [nls=no],
-# [AC_MSG_ERROR([glib-2.2 is required])])
-#fi
-
dnl disbale raw mode
AC_MSG_CHECKING([Place the terminal into raw mode])
AC_ARG_ENABLE([raw-mode],
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=yes@:>@]),
- [clock_screen="$enableval"],
- [clock_screen=yes])
-AC_MSG_RESULT([$clock_screen])
-if test "x$clock_screen" != "xyes" ; then
- AC_DEFINE(DISABLE_CLOCK_SCREEN, 1, [Disable clock screen])
-fi
-
dnl Optional screen - lyrics
AC_MSG_CHECKING([whether to include the lyrics screen])
AC_ARG_ENABLE([lyrics-screen],
AC_HELP_STRING([--enable-lyrics-screen],
[Enable lyrics screen @<:@default=no@:>@]),
[lyrics_screen="$enableval"],
- [lyrics_screen=yes])
+ [lyrics_screen=no])
if test "x$lyrics_screen" != "xyes" ; then
AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
lyrics_screen=no
fi
-#lyrics_screen=yes
-#if test "x$libcurl" != "xyes" ; then
-# AC_MSG_RESULT([$lyrics_screen])
- # AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
- # lyrics_screen=no
-#fi
-if test "x$gthread" != "xyes" ; then
- AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
- lyrics_screen=no
-fi
-#if test "x$have_expat" != "xyes" ; then
-# AC_DEFINE(DISABLE_LYRICS_SCREEN, 1, [Disable lyrics screen])
-# lyrics_screen=no
-#fi
+
+AM_CONDITIONAL(LYRICS, test x$lyrics_screen = xyes)
AC_MSG_RESULT([$lyrics_screen])
+AC_ARG_WITH([lyrics-plugin-dir],
+ AC_HELP_STRING([[--with-lyrics-plugin-dir[=DIRECTORY]]],
+ [Directory where lyrics plugins are stored @<:@default=PREFIX/lib/ncmpc/lyrics@:>@]),
+ [lyrics_plugin_dir=$withval],
+ [lyrics_plugin_dir=""])
+if test "x${lyrics_plugin_dir}" = "x"; then
+ if test "x${prefix}" = "xNONE"; then
+ lyrics_plugin_dir="${ac_default_prefix}/lib/ncmpc/lyrics"
+ else
+ lyrics_plugin_dir="${prefix}/lib/ncmpc/lyrics"
+ fi
+fi
+AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$lyrics_plugin_dir"],
+ [Directory to search for lyrics plugins])
+AC_SUBST(lyrics_plugin_dir)
+
dnl Default host
AC_MSG_CHECKING([for default MPD host])
AC_ARG_WITH([default-host],
[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])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile po/Makefile.in po/Makefile])
AC_OUTPUT