Bug 1228463 - Set MOZ_PIXMAN_{CFLAGS,LIBS} directly from PKG_CHECK_MODULES. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 27 Nov 2015 13:03:20 +0900
changeset 274728 d951ff1e269954b11fa528f14e5c36e4464cfaec
parent 274727 778332f8017da6b4823abda4aec1a9027f43f773
child 274729 ea00141d4b5aff18764b128a328f7cb3a69ee260
push id68664
push usermh@glandium.org
push dateMon, 30 Nov 2015 23:26:52 +0000
treeherdermozilla-inbound@d951ff1e2699 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1228463, 1224452
milestone45.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 1228463 - Set MOZ_PIXMAN_{CFLAGS,LIBS} directly from PKG_CHECK_MODULES. r=mshal PKG_CHECK_MODULES sets the values, and AC_SUBST_LISTs them on its own. No need to duplicate the values to variables local to configure.in to then AC_SUBST/AC_SUBST_LIST them. Also, since bug 1224452, MOZ_PIXMAN_CFLAGS needs to be an AC_SUBST_LIST instead of AC_SUBST.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8138,22 +8138,18 @@ if test "$MOZ_TREE_PIXMAN" = "force"; th
     fi
 elif test -z "$MOZ_TREE_CAIRO"; then
     MOZ_TREE_PIXMAN=
 fi
 
 if test "$MOZ_TREE_PIXMAN"; then
     AC_DEFINE(MOZ_TREE_PIXMAN)
 else
-    PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.19.2)
-    MOZ_PIXMAN_CFLAGS="$PIXMAN_CFLAGS"
-    MOZ_PIXMAN_LIBS="$PIXMAN_LIBS"
-fi
-AC_SUBST(MOZ_PIXMAN_CFLAGS)
-AC_SUBST_LIST(MOZ_PIXMAN_LIBS)
+    PKG_CHECK_MODULES(MOZ_PIXMAN, pixman-1 >= 0.19.2)
+fi
 
 # Check for headers defining standard int types.
 if test -n "$COMPILE_ENVIRONMENT"; then
     MOZ_CHECK_HEADERS(stdint.h inttypes.h)
 
     if test "${ac_cv_header_inttypes_h}" = "yes"; then
         HAVE_INTTYPES_H=1
     fi