diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-24 20:54:14 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-24 20:54:14 -0500 |
| commit | 355c6b69c69b0bc8cf10b7a3c846b5d6ca27abc4 (patch) | |
| tree | 392188e28ca99b4fb8e754a2ebb55b6752a3c4d7 /configure.in | |
| parent | 5af9907fee05f882f8d2422e47198ebf61d97bb7 (diff) | |
| download | ktorrent-355c6b69c69b0bc8cf10b7a3c846b5d6ca27abc4.tar.gz ktorrent-355c6b69c69b0bc8cf10b7a3c846b5d6ca27abc4.zip | |
Change default configuration to use external geoip database when found and
use internal database only when external database is not found.
This resolves bug report 443.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 31a7116..fc4482e 100644 --- a/configure.in +++ b/configure.in @@ -191,7 +191,7 @@ AC_ARG_ENABLE(geoip, esac],[geoip=true]) AC_ARG_ENABLE(system-geoip, - [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (no by default)])], + [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (auto by default)])], [case "${enableval}" in yes) if test "$have_system_geoip" = yes; then system_geoip=true @@ -199,9 +199,18 @@ AC_ARG_ENABLE(system-geoip, else AC_MSG_ERROR(cannot enable system geoip. GeoIP library headers were not found on your system) fi ;; - no) system_geoip=true ;; + no) system_geoip=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-geoip) ;; - esac],[system_geoip=false]) + esac],[system_geoip=auto]) + +if test x$system_geoip = xauto; then + if test "$have_system_geoip" = yes; then + system_geoip=true + geoip=false + else + system_geoip=false + fi +fi AM_CONDITIONAL(ENABLE_GEOIP, test x$geoip = xtrue) AM_CONDITIONAL(USE_SYSTEM_GEOIP, test x$system_geoip = xtrue) @@ -212,12 +221,20 @@ fi AC_ARG_ENABLE(builtin-country-flags, - [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (yes by default)])], + [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (auto by default)])], [case "${enableval}" in yes) builtin_country_flags=true ;; no) builtin_country_flags=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-builtin-country-flags) ;; - esac],[builtin_country_flags=true]) + esac],[builtin_country_flags=auto]) + +if test x$builtin_country_flags = xauto; then + if test x$geoip = xtrue; then + builtin_country_flags=true + else + builtin_country_flags=false + fi +fi AM_CONDITIONAL(ENABLE_BUILTIN_COUNTRY_FLAGS, test x$builtin_country_flags = xtrue) |