From: hno <>
Date: Fri, 10 Dec 2004 07:44:29 +0000 (+0000)
Subject: Bug #1152: Document --enable-esi in squid.conf.default
X-Git-Tag: SQUID_3_0_PRE4~988
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59254e075e36fe4203b019b832a659aceb02763f;p=thirdparty%2Fsquid.git

Bug #1152: Document --enable-esi in squid.conf.default
---

diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index 078e0259b0..9cfe74b2b2 100644
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cf_gen.cc,v 1.51 2003/04/24 06:35:08 hno Exp $
+ * $Id: cf_gen.cc,v 1.52 2004/12/10 00:44:29 hno Exp $
  *
  * DEBUG: none          Generate squid.conf.default and cf_parser.h
  * AUTHOR: Max Okumoto
@@ -752,7 +752,7 @@ gen_conf(Entry * head, FILE * fp)
 
         if (!defined(entry->ifdef)) {
             fprintf(fp, "# Note: This option is only available if Squid is rebuilt with the\n");
-            fprintf(fp, "#       %s option\n#\n", available_if(entry->ifdef));
+            fprintf(fp, "#       %s\n#\n", available_if(entry->ifdef));
         }
 
         for (line = entry->doc; line != NULL; line = line->next) {
diff --git a/src/cf_gen_defines b/src/cf_gen_defines
index ab46de98c9..5c96cf9b9d 100755
--- a/src/cf_gen_defines
+++ b/src/cf_gen_defines
@@ -18,12 +18,13 @@ BEGIN {
 	define["USE_UNLINKD"]="--enable-unlinkd"
 	define["USE_USERAGENT_LOG"]="--enable-useragent-log"
 	define["USE_WCCP"]="--enable-wccp"
+	define["ESI"]="--enable-esi"
 }
 /^IFDEF:/ {
 	if (define[$2] != "")
-	    DEFINE=define[$2]
+	    DEFINE=define[$2] " option"
 	else  
-	    DEFINE="-D" $2
+	    DEFINE="-D" $2 " define"
 	print "{\"" $2 "\", \"" DEFINE "\", "
 	print "#if " $2
 	print "1"