Merge pull request xbmc#8571 from MartijnKaijser/fix_includes

[configure] make sure the top kodi src dir is always in INCLUDES
afedchin · Dec 12, 2015 · 6ab7347 · 6ab7347
2 parents dc49628 + eb79c56
commit 6ab7347
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Makefile.include.in b/Makefile.include.in
@@ -37,6 +37,7 @@ CFLAGS+=@CFLAGS@
 CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
 LDFLAGS+=@LDFLAGS@
 LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
+INCLUDES+=-I@abs_top_srcdir@
 INCLUDES+=-I@abs_top_srcdir@/lib
 INCLUDES+=-I@abs_top_srcdir@/xbmc
 INCLUDES+=-I@abs_top_srcdir@/xbmc/addons/include

diff --git a/configure.ac b/configure.ac
@@ -911,9 +911,6 @@ AC_CHECK_TYPES([char16_t, char32_t])
 AC_CHECK_SIZEOF([wchar_t])
 AC_LANG_POP([C++])
 
-# Add top source directory for all builds so we can use config.h
-INCLUDES="-I\$(abs_top_srcdir) $INCLUDES" 
-
 # Check inotify availability
 AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)