From 72acc09b264b2f93c7dfdf4f405e6e7457b6a07e Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sun, 3 May 2009 13:53:15 +0200
Subject: [PATCH] fix compilation if there were no curl dev files installed

---
 src/info.cpp   |  4 ++--
 src/info.h     |  4 ++--
 src/lyrics.cpp | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/info.cpp b/src/info.cpp
index 9e305036..cef76125 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -74,7 +74,7 @@ std::string Info::Title()
 	return itsTitle;
 }
 
-#ifdef HAVE_PTHREAD_H
+#if defined(HAVE_CURL_CURL_H) && defined(HAVE_PTHREAD_H)
 void Info::Update()
 {
 	if (!ArtistReady)
@@ -86,7 +86,7 @@ void Info::Update()
 	Downloader = 0;
 	ArtistReady = 0;
 }
-#endif // HAVE_PTHREAD_H
+#endif // HAVE_CURL_CURL_H && HAVE_PTHREAD_H
 
 void Info::GetSong()
 {
diff --git a/src/info.h b/src/info.h
index c6e10fe3..49769935 100644
--- a/src/info.h
+++ b/src/info.h
@@ -34,9 +34,9 @@ class Info : public Screen<Scrollpad>
 		
 		virtual std::string Title();
 		
-#		ifdef HAVE_PTHREAD_H
+#		if defined(HAVE_CURL_CURL_H) && defined(HAVE_PTHREAD_H)
 		virtual void Update();
-#		endif // HAVE_PTHREAD_H
+#		endif // HAVE_CURL_CURL_H && HAVE_PTHREAD_H
 		
 		virtual void EnterPressed() { }
 		virtual void SpacePressed() { }
diff --git a/src/lyrics.cpp b/src/lyrics.cpp
index 4071616a..54cd67b6 100644
--- a/src/lyrics.cpp
+++ b/src/lyrics.cpp
@@ -58,12 +58,12 @@ bool Lyrics::Reload = 0;
 
 #ifdef HAVE_CURL_CURL_H
 bool Lyrics::Ready = 0;
-#endif // HAVE_CURL_CURL_H
 
 #ifdef HAVE_PTHREAD_H
 pthread_t *Lyrics::Downloader = 0;
 pthread_mutex_t Global::CurlLock = PTHREAD_MUTEX_INITIALIZER;
 #endif // HAVE_PTHREAD_H
+#endif // HAVE_CURL_CURL_H
 
 Lyrics *myLyrics = new Lyrics;
 
@@ -81,10 +81,10 @@ void Lyrics::Resize()
 
 void Lyrics::Update()
 {
-#	ifdef HAVE_PTHREAD_H
+#	if defined(HAVE_CURL_CURL_H) && defined(HAVE_PTHREAD_H)
 	if (myLyrics->Ready)
 		myLyrics->Take();
-#	endif // HAVE_PTHREAD_H
+#	endif // HAVE_CURL_CURL_H && HAVE_PTHREAD_H
 	
 	if (!Reload)
 		return;
@@ -104,7 +104,7 @@ void Lyrics::SwitchTo()
 	}
 	else
 	{
-#		ifdef HAVE_PTHREAD_H
+#		if defined(HAVE_CURL_CURL_H) && defined(HAVE_PTHREAD_H)
 		if (Downloader && !Ready)
 		{
 			ShowMessage("Lyrics are being downloaded...");
@@ -112,7 +112,7 @@ void Lyrics::SwitchTo()
 		}
 		else if (Ready)
 			Take();
-#		endif // HAVE_PTHREAD_H
+#		endif // HAVE_CURL_CURL_H && HAVE_PTHREAD_H
 		
 		const MPD::Song *s = Reload ? myPlaylist->NowPlayingSong() : myScreen->CurrentSong();
 		
@@ -136,10 +136,10 @@ void Lyrics::SwitchTo()
 #			ifdef HAVE_CURL_CURL_H
 			static_cast<Window &>(*w) << "Fetching lyrics...";
 			w->Window::Refresh();
-#			endif // HAVE_CURL_CURL_H
 #			ifdef HAVE_PTHREAD_H
 			if (!Downloader)
 #			endif // HAVE_PTHREAD_H
+#			endif // HAVE_CURL_CURL_H
 			{
 				string file = locale_to_utf_cpy(itsSong.GetArtist()) + " - " + locale_to_utf_cpy(itsSong.GetTitle()) + ".txt";
 				EscapeUnallowedChars(file);
@@ -168,7 +168,7 @@ void Lyrics::SwitchTo()
 				}
 				else
 				{
-#					ifdef HAVE_PTHREAD_H
+#					if defined(HAVE_CURL_CURL_H) && defined(HAVE_PTHREAD_H)
 					Downloader = new pthread_t;
 					pthread_create(Downloader, 0, Get, this);
 #					elif defined(HAVE_CURL_CURL_H)