drm: Branch 'master'

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d54e546852dd6ffdc732ffa17f102b7ce87a7352
Author: Seung-Woo Kim <[email protected]>
Date:   Tue Feb 26 10:00:56 2019 +0900

    configure.ac fix build error for config.h in autotools
    
    After the commit 0926f0af54d6 ("meson,configure: include config.h
    automatically"), there is build error for autotools because
    config.h is not included. Fix the error by adding "-include
    config.h" to CPPFLAGS instead of CFLAGS from configure.ac.
    
    Reference: https://bugs.freedesktop.org/show_bug.cgi?id=106561
    Signed-off-by: Seung-Woo Kim <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>
    Fixes: 0926f0af54d654b1a958 "meson,configure: include config.h automatically"

diff --git a/configure.ac b/configure.ac
index 7e7c8d38..d72e84ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,7 +541,7 @@ else
     AC_DEFINE(HAVE_VISIBILITY, 0)
 fi
 
-CFLAGS="$CFLAGS -include config.h"
+CPPFLAGS="$CPPFLAGS -include config.h"
 
 AC_SUBST(WARN_CFLAGS)
 AC_CONFIG_FILES([


--