Use a new DLLDEFS variable in configure/Makefiles to actually remove

configure

@@ -311,7 +311,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT FONTFORGE LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPELIBS FREETYPEINCL FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDLIBWINEFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT FONTFORGE LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPELIBS FREETYPEINCL FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDLIBWINEFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
 ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'
 
 # Initialize some variables set by options.
@@ -1413,21 +1413,16 @@ then
   WIN16_FILES=""
   WIN16_INSTALL=""
 fi
-if test "x$enable_debug" = "xno"
-then
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_DEBUG_MSGS 1
-_ACEOF
+DLLDEFS=""
 
+if test "x$enable_debug" = "xno"
+then
+  DLLDEFS="$DLLDEFS -DWINE_NO_DEBUG_MSGS"
 fi
 if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno"
 then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_TRACE_MSGS 1
-_ACEOF
-
+  DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS"
 fi
 
 
@@ -21037,6 +21032,7 @@ s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
 s,@WIN16_FILES@,$WIN16_FILES,;t t
 s,@WIN16_INSTALL@,$WIN16_INSTALL,;t t
+s,@DLLDEFS@,$DLLDEFS,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
 s,@build_vendor@,$build_vendor,;t t

configure.ac

@@ -28,13 +28,15 @@ then
   WIN16_FILES=""
   WIN16_INSTALL=""
 fi
+
+AC_SUBST(DLLDEFS,"")
 if test "x$enable_debug" = "xno"
 then
-    AC_DEFINE(NO_DEBUG_MSGS,1,[Define to disable all debug messages.])
+  DLLDEFS="$DLLDEFS -DWINE_NO_DEBUG_MSGS"
 fi
 if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno"
 then
-    AC_DEFINE(NO_TRACE_MSGS,1,[Define to disable trace messages.])
+  DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS"
 fi
 
 dnl **** Check for some programs ****

dlls/Makedll.rules.in

@@ -9,9 +9,10 @@
 # plus all variables required by the global Make.rules.in
 #
 
-DEFS        = -D__WINESRC__ $(EXTRADEFS)
+DLLDEFS     = @DLLDEFS@
 DLLFLAGS    = @DLLFLAGS@
 DLLEXT      = @DLLEXT@
+DEFS        = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS)
 MAINSPEC    = $(MODULE:%.dll=%).spec
 SPEC_DEF    = $(MAINSPEC).def
 WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)

dlls/Maketest.rules.in

@@ -9,8 +9,9 @@
 # plus all variables required by the global Make.rules.in
 #
 
-DEFS         = $(EXTRADEFS)
+DLLDEFS      = @DLLDEFS@
 DLLFLAGS     = @DLLFLAGS@
+DEFS         = $(DLLDEFS) $(EXTRADEFS)
 
 MODULE       = $(TESTDLL:%.dll=%)_test.exe
 TESTLIST     = testlist.c

dlls/dxerr8/Makefile.in

-DEFS      = -D__WINESRC__
+DLLDEFS   = @DLLDEFS@
 DLLFLAGS  = @DLLFLAGS@
+DEFS      = -D__WINESRC__ $(DLLDEFS)
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/dxerr9/Makefile.in

-DEFS      = -D__WINESRC__
+DLLDEFS   = @DLLDEFS@
 DLLFLAGS  = @DLLFLAGS@
+DEFS      = -D__WINESRC__ $(DLLDEFS)
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/dxguid/Makefile.in

-DEFS      = -D__WINESRC__
+DLLDEFS   = @DLLDEFS@
 DLLFLAGS  = @DLLFLAGS@
+DEFS      = -D__WINESRC__ $(DLLDEFS)
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/strmiids/Makefile.in

-DEFS      = -D__WINESRC__
+DLLDEFS   = @DLLDEFS@
 DLLFLAGS  = @DLLFLAGS@
+DEFS      = -D__WINESRC__ $(DLLDEFS)
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/uuid/Makefile.in

-DEFS      = -D__WINESRC__
+DLLDEFS   = @DLLDEFS@
 DLLFLAGS  = @DLLFLAGS@
+DEFS      = -D__WINESRC__ $(DLLDEFS)
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

include/config.h.in

@@ -860,12 +860,6 @@
 /* Define if we have __va_copy */
 #undef HAVE___VA_COPY
 
-/* Define to disable all debug messages. */
-#undef NO_DEBUG_MSGS
-
-/* Define to disable trace messages. */
-#undef NO_TRACE_MSGS
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 

include/wine/debug.h

@@ -45,13 +45,13 @@ enum __WINE_DEBUG_CLASS {
     __WINE_DBCL_COUNT
 };
 
-#ifndef NO_TRACE_MSGS
+#ifndef WINE_NO_TRACE_MSGS
 # define __WINE_GET_DEBUGGING_TRACE(dbch) ((dbch)[0] & (1 << __WINE_DBCL_TRACE))
 #else
 # define __WINE_GET_DEBUGGING_TRACE(dbch) 0
 #endif
 
-#ifndef NO_DEBUG_MSGS
+#ifndef WINE_NO_DEBUG_MSGS
 # define __WINE_GET_DEBUGGING_WARN(dbch)  ((dbch)[0] & (1 << __WINE_DBCL_WARN))
 # define __WINE_GET_DEBUGGING_FIXME(dbch) ((dbch)[0] & (1 << __WINE_DBCL_FIXME))
 #else
@@ -80,12 +80,12 @@ enum __WINE_DEBUG_CLASS {
 #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args)))
 
 
-#ifdef NO_TRACE_MSGS
+#ifdef WINE_NO_TRACE_MSGS
 #define WINE_TRACE(args...) do { } while(0)
 #define WINE_TRACE_(ch) WINE_TRACE
 #endif
 
-#ifdef NO_DEBUG_MSGS
+#ifdef WINE_NO_DEBUG_MSGS
 #define WINE_WARN(args...) do { } while(0)
 #define WINE_WARN_(ch) WINE_WARN
 #define WINE_FIXME(args...) do { } while(0)
@@ -105,12 +105,12 @@ enum __WINE_DEBUG_CLASS {
 
 #define __WINE_PRINTF_ATTR(fmt,args)
 
-#ifdef NO_TRACE_MSGS
+#ifdef WINE_NO_TRACE_MSGS
 #define WINE_TRACE(...) do { } while(0)
 #define WINE_TRACE_(ch) WINE_TRACE
 #endif
 
-#ifdef NO_DEBUG_MSGS
+#ifdef WINE_NO_DEBUG_MSGS
 #define WINE_WARN(...) do { } while(0)
 #define WINE_WARN_(ch) WINE_WARN
 #define WINE_FIXME(...) do { } while(0)

programs/Makeprog.rules.in

@@ -9,8 +9,9 @@
 # plus all variables required by the global Make.rules.in
 #
 
-DEFS        = $(EXTRADEFS)
+DLLDEFS     = @DLLDEFS@
 DLLFLAGS    = @DLLFLAGS@
+DEFS        = $(DLLDEFS) $(EXTRADEFS)
 ALL_OBJS    = $(OBJS) $(MODULE).dbg.o
 ALL_LIBS    = $(IMPORTS:%=-l%) $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS)
 BASEMODULE  = $(MODULE:.exe=)

programs/avitools/Makefile.in

-DEFS       = $(EXTRADEFS)
+DLLDEFS    = @DLLDEFS@
 DLLFLAGS   = @DLLFLAGS@
+DEFS       = $(DLLDEFS) $(EXTRADEFS)
 TOPSRCDIR  = @top_srcdir@
 TOPOBJDIR  = ../..
 SRCDIR     = @srcdir@