build-sys: fix --without-ipinfo regressions

The commit e2d898cc16398609821f7a786ae86dcbac4884af was far from perfect it
broke all --without features.  Oh dear me.

Looks like I am not the only one breaking configure.  The --disable-ipv6 has
been broken since commit d90dd1fd8f9289fa9e880c006ca6dff0ef7d4918 and
further damaged by 2cf22b240958b72fb8d84f3ee663f84cbad2c65b.  These issues
will be addressed later.

diff --git a/configure.ac b/configure.ac
index 2859e679bc4ae14fa4c2a7bc33cf2d06d07a0eee..ea7785546ad140ba9ade8824c2fc833025e2c1bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,7 @@ AC_ARG_WITH([ipinfo],
   [AS_HELP_STRING([--without-ipinfo], [Do not try to use ipinfo lookup at all])],
   [], [with_ipinfo=yes])
 AM_CONDITIONAL([IPINFO], [test "x$with_ipinfo" = "xyes"])
-AS_IF([test "x$ipinfo" = "xno"], [
+AS_IF([test "x$with_ipinfo" = "xno"], [
   AC_DEFINE([NO_IPINFO], [1], [Define to disable ipinfo lookup])
 ])
 
@@ -113,7 +113,7 @@ AC_ARG_ENABLE([ipv6],
 USES_IPV6=
 AC_CHECK_FUNC([getaddrinfo], [
   AS_IF([test "x$WANTS_IPV6" = "xyes"], [
-    AC_DEFINE([ENABLE_IPV6], [], [Define to enable IPv6])
+    AC_DEFINE([ENABLE_IPV6], [1], [Define to enable IPv6])
     USES_IPV6=yes
   ])
 ])