screen_search: removed update() method

[ncmpc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c3aef2f017d970161329351792ee3ef02dee825b..ef9a617cdb2c88955167e5e086b31a4933c77a4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl
 
 AC_INIT(ncurses MPD client, 0.12~git, max@duempel.org, ncmpc)
 AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE([1.7 dist-bzip2])
+AM_INIT_AUTOMAKE([gnu 1.6 dist-bzip2])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -253,23 +253,27 @@ 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],