Bug #1270: --disable-hostname-checks does not work

The --enable-hostname-checks configure option was always ignored.

Forward port of 2.5 adapted patch

diff --git a/configure.in b/configure.in
index c406183c1277c39be1a68e31c3cb51adc2d1ddea..71cbe2708d6338d3915b403d69dfcf148c651cfa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.371 2005/03/19 15:24:07 serassio Exp $
+dnl  $Id: configure.in,v 1.372 2005/03/26 22:29:41 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.371 $)dnl
+AC_REVISION($Revision: 1.372 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1129,8 +1129,7 @@ AC_ARG_ENABLE(truncate,
 ])
 
 dnl Disable hostname checks
-enable_hostname_checks=0
-AC_ARG_ENABLE(hostname_checks,
+AC_ARG_ENABLE(hostname-checks,
 [  --enable-hostname-checks
                           Tells Squid to rejects any host names with
                          odd characters in their name to conform with
@@ -1139,12 +1138,9 @@ AC_ARG_ENABLE(hostname_checks,
                          no longer tries to police the use of DNS],
 [ if test "$enableval" = "yes"; then
     echo "Enabling hostname sanity checks"
-    enable_hostname_checks=1
+    AC_DEFINE(CHECK_HOSTNAMES, 1, [Enable hostname sanity checks])
   fi
 ])
-if test "$enable_hostname_checks" = 1; then
-  AC_DEFINE(CHECK_HOSTNAMES, 1, [Enable hostname sanity checks])
-fi
 
 dnl Enable underscore in hostnames
 AC_ARG_ENABLE(underscores,