From b9b0a1f58e41ba4027a16300393835dc8c632f50 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 22 Nov 2015 22:05:00 +0000 Subject: [PATCH] loader: unconditionally add AM_CPPFLAGS to libloader_la_CPPFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Tested-by: Pali Rohár Signed-off-by: Emil Velikov Reviewed-by: Matt Turner --- 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/ \ -- 2.7.4