Skip to content
This repository
Browse code

autotools: fix build hitting wrong config header (ticket #13364)

  • Loading branch information...
commit 469825b70fff8373f2f67a65b8ab348cc7eb1269 1 parent 49cd92b
Pete Beardmore authored November 19, 2012
2  Makefile.include.in
@@ -32,9 +32,9 @@ CC=@CC@
32 32
 CXXFLAGS+=@CXXFLAGS@
33 33
 CFLAGS+=@CFLAGS@
34 34
 LDFLAGS+=@LDFLAGS@
35  
-INCLUDES+=$(sort @INCLUDES@)
36 35
 INCLUDES+=-I@abs_top_srcdir@/lib
37 36
 INCLUDES+=-I@abs_top_srcdir@/xbmc
  37
+INCLUDES+=$(sort @INCLUDES@)
38 38
 ifneq (@USE_EXTERNAL_FFMPEG@,1)
39 39
 	INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
40 40
 endif
2  configure.in
@@ -843,7 +843,7 @@ if test "x$have_builtin_sync_val_compare_and_swap" = "xyes"; then
843 843
 fi
844 844
 
845 845
 # Add top source directory for all builds so we can use config.h
846  
-INCLUDES="$INCLUDES -I\$(abs_top_srcdir)"
  846
+INCLUDES="-I\$(abs_top_srcdir) $INCLUDES" 
847 847
 
848 848
 # Check inotify availability
849 849
 AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)

0 notes on commit 469825b

Please sign in to comment.
Something went wrong with that request. Please try again.