- Removed dw's RTFL stuff from dillo tree.

3 files changed, 1 insertions, 124 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e88fcf3..144b25d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,7 +101,7 @@ dillo-fltk2
  - Fix: shape=default is the background in a client-side image map.
  - Enabled client and server-side image maps.
  - Switched Window::destroy to Window::delete, fixing side effects.
- - Made zlib a configure requirement.
+ - Made zlib a configure requirement, and cleaned up configure.in.
    Patches: place (AKA corvid)
 +- Fixed a problem with locally-installed dpis.
  - Added code for optional image loading (nice interface) very advanced!
diff --git a/configure.in b/configure.in
index 0c6a031f..bfe4c738 100644
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,6 @@ AC_ARG_ENABLE(insure, [  --enable-insure         Try to compile and run with Ins
 AC_ARG_ENABLE(ansi,   [  --enable-ansi           Try to compile and run with ANSI flags],
                     , enable_ansi=no)
 AC_ARG_ENABLE(ipv6,   [  --enable-ipv6           Build with support for IPv6], , )
-AC_ARG_ENABLE(rtfl,   [  --enable-rtfl           Build with rtfl messages], enable_rtfl=yes)
 AC_ARG_ENABLE(cookies,[  --disable-cookies       Don't compile support for cookies],
                     , enable_cookies=yes)
 AC_ARG_ENABLE(png,    [  --disable-png           Disable support for PNG images],
@@ -450,9 +449,6 @@ if test "x$enable_insure" = "xyes" ; then
   CC="insure -Zoi \"compiler $CC\""
   LIBS="$LIBS -lstdc++-2-libc6.1-1-2.9.0"
 fi
-if test "x$enable_rtfl" = "xyes" ; then
-  CFLAGS="$CFLAGS -DDBG_RTFL"
-fi
 if test "x$enable_threaded_dns" = "xyes" ; then
   CFLAGS="$CFLAGS -DD_DNS_THREADED"
 fi
diff --git a/src/debug.h b/src/debug.h
index ff8baf36..14c9e922 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -26,124 +26,5 @@
 #    define DEBUG_MSG(level, ...)
 # endif /* DEBUG_LEVEL */
 
-
-
-/*
- * Following is experimental, and will be explained soon.
- */
-
-#ifdef DBG_RTFL
-
-
-#define DBG_MSG(obj, aspect, prio, msg) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:msg:%p:%s:%d:%s\n", \
-              __FILE__, __LINE__, getpid(), obj, aspect, prio, msg); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_MSGF(obj, aspect, prio, fmt, ...) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:msg:%p:%s:%d:" fmt "\n", \
-              __FILE__, __LINE__, getpid(), obj, aspect, prio, __VA_ARGS__); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_MSG_START(obj) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:msg-start:%p\n", \
-              __FILE__, __LINE__, getpid(), obj); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_MSG_END(obj) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:msg-end:%p\n", \
-              __FILE__, __LINE__, getpid(), obj); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_CREATE(obj, klass) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-create:%p:%s\n", \
-              __FILE__, __LINE__, getpid(), obj, klass); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_ASSOC(child, parent) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-assoc:%p:%p\n", \
-              __FILE__, __LINE__, getpid(), child, parent); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_SET_NUM(obj, var, val) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-set:%p:%s:%d\n", \
-              __FILE__, __LINE__, getpid(), obj, var, val); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_SET_STR(obj, var, val) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-set:%p:%s:%s\n", \
-              __FILE__, __LINE__, getpid(), obj, var, val); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_SET_PTR(obj, var, val) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-set:%p:%s:%p\n", \
-              __FILE__, __LINE__, getpid(), obj, var, val); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_ARRSET_NUM(obj, var, ind, val) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-set:%p:" var ":%d\n", \
-              __FILE__, __LINE__, getpid(), obj, ind, val); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_ARRSET_STR(obj, var, ind, val) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-set:%p:" var ":%s\n", \
-              __FILE__, __LINE__, getpid(), obj, ind, val); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_ARRSET_PTR(obj, var, ind, val) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-set:%p:" var ":%p\n", \
-              __FILE__, __LINE__, getpid(), obj, ind, val); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#define DBG_OBJ_COLOR(klass, color) \
-   D_STMT_START { \
-      printf ("[rtfl]%s:%d:%d:obj-color:%s:%s\n", \
-              __FILE__, __LINE__, getpid(), klass, color); \
-      fflush (stdout); \
-   } D_STMT_END
-
-#else /* DBG_RTFL */
-
-#define DBG_MSG(obj, aspect, prio, msg)
-#define DBG_MSGF(obj, aspect, prio, fmt, ...)
-#define DBG_MSG_START(obj)
-#define DBG_MSG_END(obj)
-#define DBG_OBJ_CREATE(obj, klass)
-#define DBG_OBJ_ASSOC(child, parent)
-#define DBG_OBJ_SET_NUM(obj, var, val)
-#define DBG_OBJ_SET_STR(obj, var, val)
-#define DBG_OBJ_SET_PTR(obj, var, val)
-#define DBG_OBJ_ARRSET_NUM(obj, var, ind, val)
-#define DBG_OBJ_ARRSET_STR(obj, var, ind, val)
-#define DBG_OBJ_ARRSET_PTR(obj, var, ind, val)
-#define DBG_OBJ_COLOR(klass, color)
-
-#endif /* DBG_RTFL */
-
 #endif /* __DEBUG_H__ */
 
-