[gaim-migrate @ 14691]

Wed, 07 Dec 2005 07:32:21 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Wed, 07 Dec 2005 07:32:21 +0000
changeset 12385
0c6ee10f9d64
parent 12384
20a3571a0ad8
child 12386
bf96a0fc2fd0

[gaim-migrate @ 14691]
I was about to gut out DEBUG_CFLAGS because nothing really used it. On second thought, I decided that as long as we have it separate, we should use it. Good, bad, ugly?

configure.ac file | annotate | diff | comparison | revisions
plugins/crazychat/Makefile.am file | annotate | diff | comparison | revisions
src/mediastreamer/Makefile.am file | annotate | diff | comparison | revisions
--- a/configure.ac	Wed Dec 07 06:54:02 2005 +0000
+++ b/configure.ac	Wed Dec 07 07:32:21 2005 +0000
@@ -343,6 +343,8 @@
 						void main() {};
 						], [
 							AC_MSG_RESULT(yes)
+							CFLAGS="$orig_CFLAGS"
+							DEBUG_CFLAGS="$DEBUG_CFLAGS $newflag"
 						], [
 							AC_MSG_RESULT(no)
 							CFLAGS="$orig_CFLAGS"
@@ -351,7 +353,7 @@
 fi
 
 if test "x$enable_deprecated" = "xno"; then
-	CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+	DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 fi
 
 if test "x$GCC" = "xyes"; then
--- a/plugins/crazychat/Makefile.am	Wed Dec 07 06:54:02 2005 +0000
+++ b/plugins/crazychat/Makefile.am	Wed Dec 07 07:32:21 2005 +0000
@@ -36,5 +36,6 @@
 	$(GTK_CFLAGS) \
 	$(GTKGLEXT_CFLAGS) \
 	$(DEBUG_CPPFLAGS) \
+	$(DEBUG_CFLAGS) \
 	$(QT_CPPFLAGS) \
 	$(MD_CPPFLAGS)
--- a/src/mediastreamer/Makefile.am	Wed Dec 07 06:54:02 2005 +0000
+++ b/src/mediastreamer/Makefile.am	Wed Dec 07 07:32:21 2005 +0000
@@ -47,7 +47,7 @@
 
 libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(VV_LIBS)
 
-AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(VV_CFLAGS) $(IPV6_CFLAGS) -DHAVE_GLIB
+AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(VV_CFLAGS) $(IPV6_CFLAGS) -DHAVE_GLIB $(DEBUG_CFLAGS)
 
 
 INCLUDES=  -I$(top_srcdir) -I$(top_srcdir)/mediastreamer $(VV_CFLAGS) 

mercurial