From be62c34e46b6a0192f0d78cfff173e8101b2fe61 Mon Sep 17 00:00:00 2001 From: LazyBui Date: Wed, 13 May 2015 00:15:10 -0500 Subject: [PATCH] Removing the confusion caused by moving GeoIP code/.dat to a different directory --- configure | 2 +- configure.ac | 2 +- src/gui/geoip/geoip.pri | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 4bdfc7ab3..83f318148 100755 --- a/configure +++ b/configure @@ -1390,7 +1390,7 @@ Optional Packages: --with-geoip-database-embedded Embed the GeoIP database in the qBittorrent executable (please follow instructions in - src/geoip/README) (default=no) + src/gui/geoip/README) (default=no) --with-qtsingleapplication=[system|shipped] Use the shipped qtsingleapplication library or the system one (default=shipped) diff --git a/configure.ac b/configure.ac index 707759201..0e97c6633 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_ARG_WITH(libtorrent-rasterbar0.16, AC_ARG_WITH(geoip-database-embedded, [AS_HELP_STRING([--with-geoip-database-embedded], - [Embed the GeoIP database in the qBittorrent executable (please follow instructions in src/geoip/README) (default=no)])], + [Embed the GeoIP database in the qBittorrent executable (please follow instructions in src/gui/geoip/README) (default=no)])], [], [with_geoip_database_embedded=no]) diff --git a/src/gui/geoip/geoip.pri b/src/gui/geoip/geoip.pri index c19c1e049..519fd0ff0 100644 --- a/src/gui/geoip/geoip.pri +++ b/src/gui/geoip/geoip.pri @@ -8,11 +8,11 @@ SOURCES += $$PWD/geoipmanager.cpp # should be embedded in qBittorrent executable contains(DEFINES, WITH_GEOIP_EMBEDDED) { exists("GeoIP.dat") { - message("GeoIP.dat was found in src/geoip/.") + message("GeoIP.dat was found in src/gui/geoip/.") RESOURCES += $$PWD/geoip.qrc } else { DEFINES -= WITH_GEOIP_EMBEDDED - error("GeoIP.dat was not found in src/geoip/ folder, please follow instructions in src/geoip/README.") + error("GeoIP.dat was not found in src/gui/geoip/ folder, please follow instructions in src/gui/geoip/README.") } } else { message("GeoIP database will not be embedded in qBittorrent executable.")