Fix configure script

configure

@@ -18,23 +18,20 @@ Main options:
  --help This help text.
 
 Dependency options:
+ --enable-debug Enable debug mode
  --disable-gui Disable qBittorrent
  Graphical user interface for
  headless running
- --enable-debug Enable debug mode
  --with-libboost-inc=[path] Path to libboost include
  files
  --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
  instructions in
  src/geoip/README)
- --disable-qtsingleapplication Disable use of
- qtsingleapplication
  --with-qtsingleapplication=[system|shipped] Use the shipped
  qtsingleapplication library
  or the system one
@@ -154,13 +151,13 @@ while [ $# -gt 0 ]; do
  shift
  ;;
 
- --disable-gui)
- QC_DISABLE_GUI="Y"
+ --enable-debug)
+ QC_ENABLE_DEBUG="Y"
  shift
  ;;
 
- --enable-debug)
- QC_ENABLE_DEBUG="Y"
+ --disable-gui)
+ QC_DISABLE_GUI="Y"
  shift
  ;;
 
@@ -179,21 +176,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
  ;;
 
- --disable-qtsingleapplication)
- QC_DISABLE_qtsingleapplication="Y"
- shift
- ;;
-
  --with-qtsingleapplication=*)
  QC_WITH_QTSINGLEAPPLICATION=$optarg
  shift
@@ -220,14 +207,12 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_DISABLE_GUI=$QC_DISABLE_GUI
 echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
+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_DISABLE_qtsingleapplication=$QC_DISABLE_qtsingleapplication
 echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
 fi
@@ -334,8 +319,8 @@ cat >$1/modules.cpp <<EOT
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.5
-arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 arg: enable-debug, Enable debug mode
+arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -666,10 +651,10 @@ cat >$1/modules_new.cpp <<EOT
  o->required = false;
  o->disabled = false;
  o = new qc_geoip_database(conf);
- o->required = false;
+ o->required = true;
  o->disabled = false;
  o = new qc_qtsingleapplication(conf);
- o->required = false;
+ o->required = true;
  o->disabled = false;
 
 EOT
@@ -1616,14 +1601,12 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_DISABLE_GUI
 export QC_ENABLE_DEBUG
+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_DISABLE_qtsingleapplication
 export QC_WITH_QTSINGLEAPPLICATION
 export QC_VERBOSE
 rm -rf .qconftemp