r2236 - branches/1.1

[des at projects.linpro.no]

Author: des
Date: 2007-11-08 22:23:27 +0100 (Thu, 08 Nov 2007)
New Revision: 2236

Modified:
   branches/1.1/
   branches/1.1/autogen.des
   branches/1.1/configure.ac
Log:
Merged revisions 2211-2212 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2211 | des | 2007-10-30 14:39:21 +0100 (Tue, 30 Oct 2007) | 2 lines
  
  Add an --enable-diagnostics option which causes DIAGNOSTICS to be defined.
........
  r2212 | des | 2007-10-30 14:41:56 +0100 (Tue, 30 Oct 2007) | 2 lines
  
  Enable diagnostics
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206,2211-2212

Modified: branches/1.1/autogen.des
===================================================================
--- branches/1.1/autogen.des	2007-11-08 21:07:37 UTC (rev 2235)
+++ branches/1.1/autogen.des	2007-11-08 21:23:27 UTC (rev 2236)
@@ -15,6 +15,7 @@
     --enable-developer-warnings \
     --enable-debugging-symbols \
     --enable-dependency-tracking \
+    --enable-diagnostics \
     --enable-extra-developer-warnings \
     --enable-stack-protector \
     --enable-werror \

Modified: branches/1.1/configure.ac
===================================================================
--- branches/1.1/configure.ac	2007-11-08 21:07:37 UTC (rev 2235)
+++ branches/1.1/configure.ac	2007-11-08 21:23:27 UTC (rev 2236)
@@ -133,6 +133,9 @@
 AC_ARG_ENABLE(debugging-symbols,
 	AS_HELP_STRING([--enable-debugging-symbols],[enable debugging symbols (default is NO)]),
 	CFLAGS="${CFLAGS} -O0 -g -fno-inline")
+AC_ARG_ENABLE(diagnostics,
+	AS_HELP_STRING([--enable-diagnostics],[enable run-time diagnostics (default is NO)]),
+	CFLAGS="${CFLAGS} -DDIAGNOSTICS")
 AC_ARG_ENABLE(extra-developer-warnings,
 	AS_HELP_STRING([--enable-extra-developer-warnings],[enable even stricter warnings (default is NO)]),
 	CFLAGS="${CFLAGS} ${EXTRA_DEVELOPER_CFLAGS}")