From 888427d2df8946a74e1075715f6214ea58b6e9d9 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 2 Jan 2011 17:30:31 +0000
Subject: [PATCH] Fix configure script

---
 configure      | 10 +++++++++-
 qbittorrent.qc |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 16534d388..cd3baa5ef 100755
--- a/configure
+++ b/configure
@@ -27,6 +27,7 @@ Dependency options:
   --with-libboost-lib=[path]                      Path to libboost library
                                                  files
   --disable-libnotify                            Disable use of libnotify
+  --disable-geoip-database                       Disable use of geoip-database
   --with-geoip-database-embedded                  Geoip Database will be
                                                  embedded in qBittorrent
                                                  executable (please follow
@@ -176,6 +177,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--disable-geoip-database)
+			QC_DISABLE_geoip_database="Y"
+			shift
+			;;
+
 		--with-geoip-database-embedded)
 			QC_WITH_GEOIP_DATABASE_EMBEDDED="Y"
 			shift
@@ -212,6 +218,7 @@ echo QC_DISABLE_GUI=$QC_DISABLE_GUI
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
 echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
+echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
 echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
 echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
@@ -651,7 +658,7 @@ cat >$1/modules_new.cpp <<EOT
     o->required = false;
     o->disabled = false;
     o = new qc_geoip_database(conf);
-    o->required = true;
+    o->required = false;
     o->disabled = false;
     o = new qc_qtsingleapplication(conf);
     o->required = true;
@@ -1606,6 +1613,7 @@ export QC_DISABLE_GUI
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBBOOST_LIB
 export QC_DISABLE_libnotify
+export QC_DISABLE_geoip_database
 export QC_WITH_GEOIP_DATABASE_EMBEDDED
 export QC_WITH_QTSINGLEAPPLICATION
 export QC_VERBOSE
diff --git a/qbittorrent.qc b/qbittorrent.qc
index f102f2d0e..ec5bf5feb 100644
--- a/qbittorrent.qc
+++ b/qbittorrent.qc
@@ -18,7 +18,6 @@
   <dep type='libnotify'>
   </dep>
   <dep type='geoip-database'>
-    <required/>
   </dep>
   <dep type='qtsingleapplication'>
     <required/>