scummvm random work

[patches.git] / wine-debug-checks.patch

2006-04-15  Mike Frysinger <vapier@gentoo.org>

	* libs/wine/Makefile.in (EXTRADEFS): Add @DLLDEFS@.
	* libs/wine/debug.c: (parse_options): Compare WINEDEBUG runtime envvar to
	WINE_NO_TRACE_MSGS and WINE_NO_DEBUG_MSGS compile time defines.

--- libs/wine/Makefile.in
+++ libs/wine/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 LIBRARY   = wine
 SOVERSION = 1
 VERSCRIPT = $(SRCDIR)/wine.map
-EXTRADEFS = -D__WINESRC__
+EXTRADEFS = -D__WINESRC__ @DLLDEFS@
 EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@
 
 C_SRCS = \
--- libs/wine/debug.c
+++ libs/wine/debug.c
@@ -138,6 +138,26 @@ static void parse_options( const char *s
                 if (len != (p - opt)) continue;
                 if (!memcmp( opt, debug_classes[i], len ))  /* found it */
                 {
+#ifdef WINE_NO_DEBUG_MSGS
+                    if (memcmp( opt, "trace", len ) != 0)
+                    {
+                        static const char error_msg[] =
+                            "Unable to trace as Wine was configured without debug support.\n"
+                            "You will need to rebuild wine with the --enable-debug configure option.\n";
+                        write( 2, error_msg, sizeof(error_msg) - 1 );
+                        exit(1);
+                    }
+#endif
+#ifdef WINE_NO_TRACE_MSGS
+                    if (memcmp( opt, "trace", len ) == 0)
+                    {
+                        static const char error_msg[] =
+                            "Unable to trace as Wine was configured without trace support.\n"
+                            "You will need to rebuild wine with the --enable-trace configure option.\n";
+                        write( 2, error_msg, sizeof(error_msg) - 1 );
+                        exit(1);
+                    }
+#endif
                     if (*p == '+') set |= 1 << i;
                     else clear |= 1 << i;
                     break;
@@ -171,7 +191,14 @@ static void debug_usage(void)
         "  WINEDEBUG=[class]+xxx,[class]-yyy,...\n\n"
         "Example: WINEDEBUG=+all,warn-heap\n"
         "    turns on all messages except warning heap messages\n"
-        "Available message classes: err, warn, fixme, trace\n";
+        "Available message classes: err, warn, fixme, trace\n"
+#ifdef WINE_NO_DEBUG_MSGS
+        "\n* err/warn/fixme support has been disabled due to --disable-debug\n"
+#endif
+#ifdef WINE_NO_TRACE_MSGS
+        "\n* trace support has been disabled due to --disable-trace\n"
+#endif
+        ;
     write( 2, usage, sizeof(usage) - 1 );
     exit(1);
 }