config.h reorg part 1: debugtools.h

[François Gouget]

   This is part one of the config.h reorg.
   This part modifies debugtools.h so that it no longer needs to include
"config.h". I will give more details about the rest in part 2.

   This patch will make it possible to use Wine's trace macros in
WineLib applications: without this patch we cannot ship debugtools.h
because it depends on config.h and we can neither ship Wine's config.h
nor require that all WineLib applications provide their own. This
probblem made it impossible to use debugtools.h from WineLib
applications.
   Note that configure will need to be regenerated after applying this
patch (there's another patch I sent earlier today that requires that
too).


Changelog:

   François Gouget <fgouget at codeweavers.com>

 * configure.in,
   include/debugtools.h,
   include/config.h.in

   Make debugtools.h independent from config.h
   Fixes the FILE_OFFSET_BITS redefinition warnings on Solaris (part 1)


-- 
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: configure.in
===================================================================
RCS file: /home/wine/wine/configure.in,v
retrieving revision 1.230
diff -u -r1.230 configure.in
--- configure.in	2001/10/23 20:35:23	1.230
+++ configure.in	2001/10/31 23:14:55
@@ -35,18 +35,18 @@
 AC_ARG_WITH(reentrant-x,
 [  --without-reentrant-x   compile for use with non-reentrant X libraries])
 
-AC_SUBST(OPTIONS)
-
 if test "$DEBUG_MSGS" = "no"
 then
-    AC_DEFINE(NO_DEBUG_MSGS, 1, [Define if all debug messages are to be compiled out])
+    OPTIONS="$OPTIONS -DNO_DEBUG_MSGS"
 fi
 
 if test "$TRACE_MSGS" = "no" -o "$DEBUG_MSGS" = "no"
 then
-    AC_DEFINE(NO_TRACE_MSGS, 1, [Define if TRACE messages are to be compiled out])
+    OPTIONS="$OPTIONS -DNO_TRACE_MSGS"
 fi
 
+AC_SUBST(OPTIONS)
+
 dnl **** Check for some programs ****
 
 AC_PROG_MAKE_SET
Index: include/debugtools.h
===================================================================
RCS file: /home/wine/wine/include/debugtools.h,v
retrieving revision 1.13
diff -u -r1.13 debugtools.h
--- include/debugtools.h	2000/12/22 20:28:19	1.13
+++ include/debugtools.h	2001/10/31 23:14:57
@@ -5,7 +5,6 @@
 #ifdef __WINE__  /* Debugging interface is internal to Wine */
 
 #include <stdarg.h>
-#include "config.h"
 #include "windef.h"
 
 struct _GUID;
Index: include/config.h.in
===================================================================
RCS file: /home/wine/wine/include/config.h.in,v
retrieving revision 1.89
diff -u -r1.89 config.h.in
--- include/config.h.in	2001/10/23 20:06:33	1.89
+++ include/config.h.in	2001/10/31 23:14:57
@@ -427,12 +430,6 @@
 /* Define if you have the xpg4 library (-lxpg4).  */
 #undef HAVE_LIBXPG4
 
-/* Define if all debug messages are to be compiled out */
-#undef NO_DEBUG_MSGS
-
-/* Define if TRACE messages are to be compiled out */
-#undef NO_TRACE_MSGS
-
 /* Define if you have libjpeg including devel headers */
 #undef HAVE_LIBJPEG