Bug 1047173 - move MOZ_GTK*_CFLAGS hacking from config.mk to configure.in; r=glandium
authorNathan Froyd <froydnj@mozilla.com>
Fri, 01 Aug 2014 12:11:01 -0400
changeset 197690 ca2ba3cafed71299dfc000db9c4c71be656c4418
parent 197689 c835743934c32692f9c7de4cbc76db47b394485c
child 197691 eeb7077c11ff015db0f4da835c70164b513d53fb
push id47189
push usernfroyd@mozilla.com
push dateMon, 04 Aug 2014 15:30:37 +0000
treeherdermozilla-inbound@ca2ba3cafed7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1047173
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1047173 - move MOZ_GTK*_CFLAGS hacking from config.mk to configure.in; r=glandium This move ensures that other makefile variables that reference MOZ_GTK*_CFLAGS, e.g. TK_CFLAGS, will always have a consistent view of MOZ_GTK*_CFLAGS.
config/config.mk
configure.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -824,23 +824,16 @@ EXPAND_MOZLIBNAME = $(foreach lib,$(1),$
 PLY_INCLUDE = -I$(topsrcdir)/other-licenses/ply
 
 export CL_INCLUDES_PREFIX
 # Make sure that the build system can handle non-ASCII characters
 # in environment variables to prevent it from breking silently on
 # non-English systems.
 export NONASCII
 
-ifdef MOZ_GTK2_CFLAGS
-MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk/compat $(MOZ_GTK2_CFLAGS)
-endif
-ifdef MOZ_GTK3_CFLAGS
-MOZ_GTK3_CFLAGS := -I$(topsrcdir)/widget/gtk/compat-gtk3 $(MOZ_GTK3_CFLAGS)
-endif
-
 DEFINES += -DNO_NSPR_10_SUPPORT
 
 ifdef IS_GYP_DIR
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/ipc/chromium/src \
   -I$(topsrcdir)/ipc/glue \
   -I$(DEPTH)/ipc/ipdl/_ipdlheaders \
   $(NULL)
--- a/configure.in
+++ b/configure.in
@@ -4266,23 +4266,25 @@ fi
 
 if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then
    AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP)
 fi
 
 if test "$COMPILE_ENVIRONMENT"; then
   if test "$MOZ_ENABLE_GTK3"; then
     PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
+    MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS"
   fi
   if test "$MOZ_ENABLE_GTK"; then
     if test "$MOZ_X11"; then
       GDK_PACKAGES=gdk-x11-2.0
     fi
 
     PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
+    MOZ_GTK2_CFLAGS="-I${_topsrcdir}/widget/gtk/compat $MOZ_GTK2_CFLAGS"
   fi
 
 fi # COMPILE_ENVIRONMENT
 
 AC_SUBST(MOZ_FS_LAYOUT)
 
 dnl ========================================================
 dnl Use ARM userspace kernel helpers; tell NSPR to enable