Mesa (master): loader: unconditionally add AM_CPPFLAGS to libloader_la_CPPFLAGS

[Emil Velikov]

Module: Mesa
Branch: master
Commit: b9b0a1f58e41ba4027a16300393835dc8c632f50
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9b0a1f58e41ba4027a16300393835dc8c632f50

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sun Nov 22 22:05:00 2015 +0000

loader: unconditionally add AM_CPPFLAGS to libloader_la_CPPFLAGS

It seems that due to the conditional autotools is getting confused and
forgetting to add AM_CPPFLAGS when building libloader (when
HAVE_DRICOMMON is not set).

Cc: mesa-stable at lists.freedesktop.org
Fixes: 5a79e0a8e37 "automake: loader: rework the CPPFLAGS"
Reported-by: Pali Rohár <pali.rohar at gmail.com>
Tested-by: Pali Rohár <pali.rohar at gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/loader/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 5021120..9ca1754 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -34,12 +34,12 @@ AM_CPPFLAGS = \
 	$(LIBDRM_CFLAGS) \
 	$(LIBUDEV_CFLAGS)
 
+libloader_la_CPPFLAGS = $(AM_CPPFLAGS)
 libloader_la_SOURCES = $(LOADER_C_FILES)
 libloader_la_LIBADD =
 
 if HAVE_DRICOMMON
-libloader_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+libloader_la_CPPFLAGS += \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
 	-I$(top_builddir)/src/mesa/drivers/dri/common/ \
 	-I$(top_srcdir)/src/mesa/ \