[svn] Renamed DEBUG to ENABLE_DEBUG.

ChangeLog

@@ -1,3 +1,7 @@
+2003-10-08  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* configure.in: Renamed DEBUG to ENABLE_DEBUG.
+
 2003-10-04  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* libtool.m4: New file with contents imported from libtool.

configure.in

@@ -71,8 +71,8 @@ test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
 
 AC_ARG_ENABLE(debug,
 [  --disable-debug         disable support for debugging output],
-DEBUG=$enableval, DEBUG=yes)
+ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
-test x"${DEBUG}" = xyes && AC_DEFINE(DEBUG)
+test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG)
 
 wget_need_md5=no
 

src/ChangeLog

@@ -1,3 +1,10 @@
+2003-10-08  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* config.h.in: Renamed DEBUG to ENABLE_DEBUG.  ENABLE_DEBUG is, I
+	think, a better name, because it implies that debugging output is
+	merely possible, not "on by default", as might be construed from
+	just DEBUG.
+
 2003-10-08  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* ftp.c (has_insecure_name_p): Define it here.

src/config.h.in

@@ -101,7 +101,7 @@ char *alloca ();
 #undef USE_DIGEST
 
 /* Define if you want the debug output support compiled in.  */
-#undef DEBUG
+#undef ENABLE_DEBUG
 
 /* Define if you have sys/time.h header.  */
 #undef HAVE_SYS_TIME_H

src/host.c

@@ -585,7 +585,7 @@ cache_host_lookup (const char *host, struct address_list *al)
   ++al->refcount;
   hash_table_put (host_name_addresses_map, xstrdup_lower (host), al);
 
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
   if (opt.debug)
     {
       int i;

src/http.c

@@ -1136,7 +1136,7 @@ Accept: %s\r\n\
 	    hs->error = xstrdup (error);
 
 	  if ((statcode != -1)
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
 	      && !opt.debug
 #endif
 	      )

src/init.c

@@ -128,7 +128,7 @@ static struct {
   { "convertlinks",	&opt.convert_links,	cmd_boolean },
   { "cookies",		&opt.cookies,		cmd_boolean },
   { "cutdirs",		&opt.cut_dirs,		cmd_number },
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
   { "debug",		&opt.debug,		cmd_boolean },
 #endif
   { "deleteafter",	&opt.delete_after,	cmd_boolean },

src/log.c

@@ -509,7 +509,7 @@ logprintf (enum log_options o, const char *fmt, ...)
   while (!done);
 }
 
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
 /* The same as logprintf(), but does anything only if opt.debug is
    non-zero.  */
 void
@@ -535,7 +535,7 @@ debug_logprintf (const char *fmt, ...)
       while (!done);
     }
 }
-#endif /* DEBUG */
+#endif /* ENABLE_DEBUG */
 
 /* Open FILE and set up a logging stream.  If FILE cannot be opened,
    exit with status of 1.  */

src/main.c

@@ -459,12 +459,12 @@ hpVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:C:",
 	  setoptval ("continue", "on");
 	  break;
 	case 'd':
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
 	  setoptval ("debug", "on");
-#else  /* not DEBUG */
+#else
 	  fprintf (stderr, _("%s: debug support not compiled in.\n"),
 		   exec_name);
-#endif /* not DEBUG */
+#endif
 	  break;
 	case 'E':
 	  setoptval ("htmlextension", "on");

src/options.h

@@ -130,9 +130,9 @@ struct options
   int save_headers;		/* Do we save headers together with
 				   file? */
 
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
   int debug;			/* Debugging on/off */
-#endif /* DEBUG */
+#endif
 
   int timestamping;		/* Whether to use time-stamping. */
 

src/wget.h

@@ -34,9 +34,10 @@ so, delete this exception statement from your version.  */
 #ifndef WGET_H
 #define WGET_H
 
-#ifndef DEBUG
+/* Disable assertions when debug support is not compiled in. */
-# define NDEBUG /* To kill off assertions */
+#ifndef ENABLE_DEBUG
-#endif /* not DEBUG */
+# define NDEBUG
+#endif
 
 /* Define this if you want primitive but extensive malloc debugging.
    It will make Wget extremely slow, so only do it in development
@@ -65,7 +66,7 @@ so, delete this exception statement from your version.  */
 /* No-op version of gettext, used for constant strings. */
 #define N_(string) (string)
 
-/* I18N NOTE: You will notice that none of the DEBUG messages are
+/* I18N NOTE: You will notice that none of the DEBUGP messages are
    marked as translatable.  This is intentional, for a few reasons:
 
    1) The debug messages are not meant for the users to look at, but
@@ -90,11 +91,11 @@ so, delete this exception statement from your version.  */
 #define DO_NOTHING do {} while (0)
 
 /* Print X if debugging is enabled; a no-op otherwise.  */
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
 # define DEBUGP(x) do { if (opt.debug) { debug_logprintf x; } } while (0)
-#else  /* not DEBUG */
+#else  /* not ENABLE_DEBUG */
 # define DEBUGP(x) DO_NOTHING
-#endif /* not DEBUG */
+#endif /* not ENABLE_DEBUG */
 
 /* Make gcc check for the format of logmsg() and debug_logmsg().  */
 #ifdef __GNUC__

windows/Makefile.src

@@ -46,7 +46,7 @@ CC       = cl
 LD       = link
 
 CFLAGS   = /nologo /MT /W0 /O2
-#DEBUGCF  = /DDEBUG /Zi /Od #/Fd /FR
+#DEBUGCF  = /DENABLE_DEBUG /Zi /Od #/Fd /FR
 CPPFLAGS = 
 DEFS     = /DWINDOWS /D_CONSOLE /DHAVE_CONFIG_H /DSYSTEM_WGETRC=\"wgetrc\"
 LDFLAGS  = /subsystem:console /incremental:no /warn:3