From 3c28c04b4063784f208fbe752dafc63a3a9e8f4e Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 12 Mar 2007 12:21:02 +0000
Subject: [PATCH] Added a new parameter to configure file :
 --with-libtorrent-inc=[path]     Path to libtorrent include files

---
 configure          | 41 +++++++++++++++++++++++++++++++----------
 qcm/libtorrent.qcm | 31 +++++++++++++++++++++----------
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/configure b/configure
index 980022aff..bfb38ca7f 100755
--- a/configure
+++ b/configure
@@ -17,6 +17,9 @@ Main options:
   --verbose           Show extra configure output.
   --help              This help text.
 
+Dependency options:
+  --with-libtorrent-inc=[path]     Path to libtorrent include files
+
 EOT
 }
 
@@ -132,6 +135,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--with-libtorrent-inc=*)
+			QC_WITH_LIBTORRENT_INC=$optarg
+			shift
+			;;
+
 		--verbose)
 			QC_DEBUG="Y"
 			shift
@@ -153,6 +161,7 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
+echo QC_WITH_LIBTORRENT_INC=$QC_WITH_LIBTORRENT_INC
 echo
 fi
 
@@ -250,6 +259,7 @@ public:
 /*
 -----BEGIN QCMOD-----
 name: libtorrent
+arg: with-libtorrent-inc=[path], Path to libtorrent include files
 -----END QCMOD-----
 */
 class qc_libtorrent : public ConfObj
@@ -260,16 +270,26 @@ public:
 	QString shortname() const { return "libtorrent"; }
 	bool exec(){
           QString s;
-          QStringList sl;
-          sl += "/usr/include";
-          sl += "/usr/local/include";
-          sl += "/sw/include";
-          if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) {
-            qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
-            return false;
-          }
-	  conf->addIncludePath(s);
-          return true;
+					s = conf->getenv("QC_WITH_LIBTORRENT_INC");
+					if(!s.isEmpty()) {
+						if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) {
+        			qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
+							return false;
+      			}
+      			conf->addIncludePath(s);
+						return true;
+					}else{
+	          QStringList sl;
+  	        sl += "/usr/include";
+    	      sl += "/usr/local/include";
+      	    sl += "/sw/include";
+        	  if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) {
+          	  qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
+            	return false;
+          	}
+	  				conf->addIncludePath(s);
+          	return true;
+					}
 	}
 };
 #line 1 "libboost.qcm"
@@ -1303,6 +1323,7 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
+export QC_WITH_LIBTORRENT_INC
 export QC_DEBUG
 rm -rf .qconftemp
 (
diff --git a/qcm/libtorrent.qcm b/qcm/libtorrent.qcm
index f7ab7f532..68b424524 100644
--- a/qcm/libtorrent.qcm
+++ b/qcm/libtorrent.qcm
@@ -1,6 +1,7 @@
 /*
 -----BEGIN QCMOD-----
 name: libtorrent
+arg: with-libtorrent-inc=[path], Path to libtorrent include files
 -----END QCMOD-----
 */
 class qc_libtorrent : public ConfObj
@@ -11,15 +12,25 @@ public:
 	QString shortname() const { return "libtorrent"; }
 	bool exec(){
           QString s;
-          QStringList sl;
-          sl += "/usr/include";
-          sl += "/usr/local/include";
-          sl += "/sw/include";
-          if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) {
-            qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
-            return false;
-          }
-	  conf->addIncludePath(s);
-          return true;
+					s = conf->getenv("QC_WITH_LIBTORRENT_INC");
+					if(!s.isEmpty()) {
+						if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) {
+        			qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
+							return false;
+      			}
+      			conf->addIncludePath(s);
+						return true;
+					}else{
+	          QStringList sl;
+  	        sl += "/usr/include";
+    	      sl += "/usr/local/include";
+      	    sl += "/sw/include";
+        	  if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) {
+          	  qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
+            	return false;
+          	}
+	  				conf->addIncludePath(s);
+          	return true;
+					}
 	}
 };