Refactored --enable-debug-cbdata option

diff --git a/configure.in b/configure.in
index 04e91947a2b765175d8cf1ce8abb17c628cd4dc6..e9b8a6533587390376fb44ec444878e3c3c4552b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -354,21 +354,26 @@ AC_ARG_ENABLE(inline,
 ])
 
 if test "$SquidInline" = "yes" ; then
-    AC_DEFINE(_SQUID_INLINE_, inline, [Keyword used by squid for inlining methods])
-    AC_DEFINE(_USE_INLINE_, 1 , [Include inline methods into header file])
+    AC_DEFINE(_SQUID_INLINE_, inline,
+           [Keyword used by squid for inlining methods])
+    AC_DEFINE(_USE_INLINE_, 1 ,
+           [Include inline methods into header file])
 else
     AC_MSG_NOTICE([Inlining optimization disabled])
-    AC_DEFINE(_SQUID_INLINE_,[], [Keyword used by squid for inlining methods])
+    AC_DEFINE(_SQUID_INLINE_,[], 
+           [Keyword used by squid for inlining methods])
 fi
 
 AC_ARG_ENABLE(debug-cbdata,
   AS_HELP_STRING([--enable-debug-cbdata],
       [Provide some debug information in cbdata]), [ 
-if test "$enableval" = "yes" ; then
-  AC_MSG_NOTICE([cbdata debugging enabled])
-  AC_DEFINE(CBDATA_DEBUG,1, [Enable support for cbdata debug information])
-fi
+SQUID_YESNO([$enableval],
+    [unrecognized argument to --enable-debug-cbdata: $enableval])
 ])
+SQUID_DEFINE_BOOL(CBDATA_DEBUG,${enable_debug_cbdata:=no},
+    [Enable support for cbdata debug information])
+AC_MSG_NOTICE([cbdata debugging enabled: $enable_debug_cbdata])
+
 
 dnl Nasty hack to get autoconf 2.64 on Linux to run.
 dnl all other uses of RUN_IFELSE are wrapped inside CACHE_CHECK which breaks on 2.64
@@ -2117,7 +2122,7 @@ esac
 dnl automake handles this AC_PATH_PROG(MAKEDEPEND, makedepend, $TRUE)
 
 case "$host" in
-    *-hp-hpux*)
+    *hpux*)
        AC_MSG_NOTICE([Disabling ranlib for HP-UX...])
        RANLIB=":"
        ;;