From c8191700b1c412c1dcd328f409b6e5f8aa310029 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 11 Dec 2011 00:08:13 +0900
Subject: [PATCH] Fixed compile error without BitTorrent and Metalink support

---
 src/Makefile.am      | 16 ++++++++--------
 src/RpcMethodImpl.cc |  7 +++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 80a6f13b..6a754611 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -237,6 +237,14 @@ SRCS += XmlAttr.cc XmlAttr.h\
 	ParserStateMachine.h
 endif # HAVE_SOME_XMLLIB
 
+if HAVE_LIBXML2
+SRCS +=  Xml2XmlParser.cc Xml2XmlParser.h
+endif # HAVE_LIBXML2
+
+if HAVE_LIBEXPAT
+SRCS +=  ExpatXmlParser.cc ExpatXmlParser.h
+endif # HAVE_LIBEXPAT
+
 if ENABLE_XML_RPC
 SRCS += XmlRpcRequestParserController.cc XmlRpcRequestParserController.h\
 	XmlRpcRequestParserStateMachine.cc XmlRpcRequestParserStateMachine.h\
@@ -496,14 +504,6 @@ SRCS += Metalinker.cc Metalinker.h\
 	MetalinkPostDownloadHandler.cc MetalinkPostDownloadHandler.h\
 	metalink_helper.cc metalink_helper.h
 
-if HAVE_LIBXML2
-SRCS +=  Xml2XmlParser.cc Xml2XmlParser.h
-endif # HAVE_LIBXML2
-
-if HAVE_LIBEXPAT
-SRCS +=  ExpatXmlParser.cc ExpatXmlParser.h
-endif # HAVE_LIBEXPAT
-
 endif # ENABLE_METALINK
 
 if !HAVE_ASCTIME_R
diff --git a/src/RpcMethodImpl.cc b/src/RpcMethodImpl.cc
index 01f03173..03ff086a 100644
--- a/src/RpcMethodImpl.cc
+++ b/src/RpcMethodImpl.cc
@@ -1137,8 +1137,11 @@ void changeOption
     }
   }
   if(option.defined(PREF_DIR) || option.defined(PREF_OUT)) {
-    if(dctx->getFileEntries().size() == 1 &&
-       !dctx->hasAttribute(bittorrent::BITTORRENT)) {
+    if(dctx->getFileEntries().size() == 1
+#ifdef ENABLE_BITTORRENT
+       && !dctx->hasAttribute(bittorrent::BITTORRENT)
+#endif // ENABLE_BITTORRENT
+       ) {
       dctx->getFirstFileEntry()->setPath
         (grOption->blank(PREF_OUT) ? A2STR::NIL :
          util::applyDir(grOption->get(PREF_DIR), grOption->get(PREF_OUT)));