diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-24 20:54:14 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-06 03:48:53 +0200 |
| commit | 56a711f2419bf6d9bf62bf2d6d3f4caa998108cf (patch) | |
| tree | 1420195f8f8f6f8b786f51a24e2b8753929c7511 /configure.in.in | |
| parent | efc0041311ffa4d2d6172e2dd7cb72b6d98cc77e (diff) | |
| download | ktorrent-56a711f2419bf6d9bf62bf2d6d3f4caa998108cf.tar.gz ktorrent-56a711f2419bf6d9bf62bf2d6d3f4caa998108cf.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.
(cherry picked from commit 355c6b69c69b0bc8cf10b7a3c846b5d6ca27abc4)
Diffstat (limited to 'configure.in.in')
| -rw-r--r-- | configure.in.in | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/configure.in.in b/configure.in.in index fae7ea7..438fff9 100644 --- a/configure.in.in +++ b/configure.in.in @@ -126,7 +126,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 @@ -134,9 +134,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) @@ -147,12 +156,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) |