From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun, 22 Nov 2015 22:05:00 +0000 (+0000)
Subject: loader: unconditionally add AM_CPPFLAGS to libloader_la_CPPFLAGS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b9b0a1f58e41ba4027a16300393835dc8c632f50;p=mesa.git

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@lists.freedesktop.org
Fixes: 5a79e0a8e37 "automake: loader: rework the CPPFLAGS"
Reported-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 5021120c96d..9ca17540d54 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/ \