configure[.in]: adjust fix --disable-mod_ipv6calc to support also EL6

databases/lib/libipv6calc_db_wrapper.c: fix for 32 bit systems
pbiering · Sep 8, 2019 · 736a66b · 736a66b
1 parent afb5550
commit 736a66b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -12,6 +12,8 @@ Info:
 20190908/PB:
 	autogen.sh: small bugfix
 	databases/lib/libipv6calc_db_wrapper_MMDB.c: make clang happy by initialization of "result_MMDB_lookup_sockaddr"
+	configure[.in]: adjust fix --disable-mod_ipv6calc to support also EL6
+	databases/lib/libipv6calc_db_wrapper.c: fix for 32 bit systems
 
 20190907/PB:
 	databases/lib/libipv6calc_db_wrapper_MMDB.c: add support for registered_country (fallback)

diff --git a/configure b/configure
@@ -1417,6 +1417,7 @@ Optional Features:
   --enable-mod_ipv6calc   Enable build of mod_ipv6calc for Apache (default:
                           disabled)
 
+
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -6621,7 +6622,6 @@ fi
 # Check whether --enable-mod_ipv6calc was given.
 if test "${enable_mod_ipv6calc+set}" = set; then :
   enableval=$enable_mod_ipv6calc;
-
 fi
 
 

diff --git a/configure.in b/configure.in
@@ -1403,10 +1403,8 @@ dnl mod_ipv6calc / apxs - APache eXtension tool
 dnl *************************************************
 AC_ARG_ENABLE([mod_ipv6calc], 
 	AS_HELP_STRING([--enable-mod_ipv6calc],
-		[Enable build of mod_ipv6calc for Apache (default: disabled)]),
-	[
-	],[
-	])
+		[Enable build of mod_ipv6calc for Apache (default: disabled)])
+	)
 
 if test "$enable_mod_ipv6calc" = "yes"; then
     ENABLE_MOD_IPV6CALC="1"

diff --git a/databases/lib/libipv6calc_db_wrapper.c b/databases/lib/libipv6calc_db_wrapper.c
@@ -3642,7 +3642,7 @@ int libipv6calc_db_asn_filter_parse(s_ipv6calc_filter_db_asn *filter, const char
 		asn = (uint32_t) strtol(token + offset, NULL, 10);
 
 		if (errno == ERANGE) {
-			ERRORPRINT_WA("filter token 'asn=' requires a valid decimal number between 0 and %lu: %s:", (1UL << 32) - 1, token + offset);
+			ERRORPRINT_WA("filter token 'asn=' requires a valid decimal number between 0 and %lu: %s:", (long unsigned int) 0xffffffff, token + offset);
 			goto END_ipv6calc_db_asn_filter_parse;
 		};
 	};