From 3b9e6b85d9f6786d7379a82d0eead833b2befbf4 Mon Sep 17 00:00:00 2001
From: Qball Cow <qball@sarine.nl>
Date: Tue, 11 Aug 2009 16:46:28 +0200
Subject: [PATCH] Re-add gmpc-lyricwiki and gmpc-awn.

gmpc-lyricwiki is fixed again. so  it is fine for release.
gmpc-awn got the green light from malept.
---
 Makefile.am  | 11 ++++++++---
 autogen.sh   |  4 ++--
 configure.ac | 57 +++++++++++++++++++++++++++++++++++++++------------------
 3 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 115eb28..8b344f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 AUTOMAKE_OPTIONS = foreign 1.6
 
+if AWN_OPT
+AWN_OPT_DIR= gmpc-awn
+endif
 
 if LAST_FM_OPT
 LAST_FM_OPT_DIR= gmpc-last.fm
@@ -9,9 +12,9 @@ if COVERAMAZON_OPT
 COVERAMAZON_OPT_DIR= gmpc-coveramazon
 endif
 
-#if LYRICWIKI_OPT
-#LYRICWIKI_OPT_DIR= gmpc-lyricwiki
-#endif
+if LYRICWIKI_OPT
+LYRICWIKI_OPT_DIR= gmpc-lyricwiki
+endif
 
 if MDCOVER_OPT 
 MDCOVER_OPT_DIR= gmpc-mdcover
@@ -94,6 +97,7 @@ endif
 SUBDIRS =\
 		$(ALARM_OPT_DIR)\
 		$(AVAHI_OPT_DIR)\
+        $(AWN_OPT_DIR)\
 		$(COVERAMAZON_OPT_DIR)\
 		$(EXTRAPLAYLIST_OPT_DIR)\
 		$(JAMENDO_OPT_DIR)\
@@ -112,4 +116,5 @@ SUBDIRS =\
 		$(LYRICSPLUGIN_OPT_DIR)\
 		$(ALBUMVIEW_OPT_DIR)\
         $(DISCOGS_OPT_DIR)\
+        $(LYRICWIKI_OPT_DIR)\
         $(FULLSCREENINFO_OPT_DIR)
diff --git a/autogen.sh b/autogen.sh
index fec322d..b72eb15 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -50,6 +50,7 @@ function get_hg_cmake ()
 get_plugin gmpc-alarm
 get_plugin gmpc-albumview
 get_plugin gmpc-avahi
+get_plugin gmpc-awn
 get_plugin gmpc-coveramazon
 get_plugin gmpc-discogs
 get_plugin gmpc-extraplaylist
@@ -60,8 +61,7 @@ get_plugin gmpc-libnotify
 get_plugin gmpc-lirc
 get_plugin gmpc-libnotify
 get_plugin gmpc-lyrics
-# Disabled because of closed api.
-#get_plugin gmpc-lyricwiki
+get_plugin gmpc-lyricwiki
 get_plugin gmpc-magnatune
 get_plugin gmpc-mdcover
 get_plugin gmpc-mserver
diff --git a/configure.ac b/configure.ac
index ff4f76b..098f555 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,22 @@ AC_PROG_CC
 
 
 ##
+# AWN 
+##
+AC_ARG_ENABLE(awn,
+         [  --enable-awn],
+         [ case "${enableval}" in
+         yes)    enable_awn=yes;;
+          no)    enable_awn=no;;
+           *)    AC_MSG_ERROR([bad value ${enableval} for --enable-awn]);;
+          esac],
+         [enable_awn=yes])
+ 
+AM_CONDITIONAL([AWN_OPT],[test x"$enable_awn" = xyes])
+if test x${enable_awn} = xyes; then
+    AC_CONFIG_SUBDIRS([gmpc-awn])
+fi
+##
 # Last FM
 ##
 AC_ARG_ENABLE(lastfm,
@@ -41,20 +57,20 @@ fi
 
 ##
 # lyricwiki
-# Changed because of api change. Not allowed to fetch lyrics anymore.
+# 
 ##
-#AC_ARG_ENABLE(lyricwiki,
-#         [  --enable-lyricwiki],
-#         [ case "${enableval}" in
-#         yes)    enable_lyricwiki=yes;;
-#          no)    enable_lyricwiki=no;;
-#           *)    AC_MSG_ERROR([bad value ${enableval} for --enable-lyricwiki]);;
-#          esac],
-#         [enable_lyricwiki=yes])
-#AM_CONDITIONAL([LYRICWIKI_OPT], [test "$enable_lyricwiki" = yes])
-#if test x${enable_lyricwiki} = xyes; then
-#    AC_CONFIG_SUBDIRS([gmpc-lyricwiki])
-#fi
+AC_ARG_ENABLE(lyricwiki,
+         [  --enable-lyricwiki],
+         [ case "${enableval}" in
+         yes)    enable_lyricwiki=yes;;
+          no)    enable_lyricwiki=no;;
+           *)    AC_MSG_ERROR([bad value ${enableval} for --enable-lyricwiki]);;
+          esac],
+         [enable_lyricwiki=yes])
+AM_CONDITIONAL([LYRICWIKI_OPT], [test "$enable_lyricwiki" = yes])
+if test x${enable_lyricwiki} = xyes; then
+    AC_CONFIG_SUBDIRS([gmpc-lyricwiki])
+fi
 
 ##
 # mdcover
@@ -424,6 +440,11 @@ AC_OUTPUT
 ##
 
 echo "======================================================"
+if test x${enable_awn} = xyes; then
+    echo "awn                               enabled"
+else
+    echo "awn                               disabled"
+fi
 if test x${enable_lastfm} = xyes; then
     echo "last.fm                           enabled"
 else
@@ -444,11 +465,11 @@ if test x${enable_mdcover} = xyes; then
 else
     echo "mdcover                           disabled"
 fi
-#if test x${enable_lyricwiki} = xyes; then
-#    echo "lyric wiki                        enabled"
-#else    
-    echo "lyric wiki                        unavailable"
-#fi
+if test x${enable_lyricwiki} = xyes; then
+    echo "lyric wiki                        enabled"
+else    
+    echo "lyric wiki                        disabled"
+fi
 if test x${enable_extraplaylist} = xyes; then
     echo "extraplaylist                     enabled"
 else
-- 
2.11.4.GIT