From 8618aff6751cae181f7a07f8e0aecd327a4cfb85 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 18 Sep 2013 13:35:53 +0100 Subject: Revert replacement of INCLUDES with AM_CPPFLAGS. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d1c4c5ade..bae8ff16b 100644 --- a/configure.ac +++ b/configure.ac @@ -543,7 +543,7 @@ case "$host_or_hostalias" in esac if test "$WIN32_SYS" = "mingw32"; then - WIN32_AM_CPPFLAGS='-I$(top_srcdir)/win32/include' + WIN32_INCLUDES='-I$(top_srcdir)/win32/include' LIBS="-lwinmm -lwsock32 $LIBS" LDFLAGS="-Wl,--enable-stdcall-fixup $LDFLAGS" dnl iberty has been needed only in older versions @@ -1140,8 +1140,8 @@ dnl --------------------------------------------- dnl some include paths ( !!! DO NOT REMOVE !!! ) dnl --------------------------------------------- -AM_CPPFLAGS='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_AM_CPPFLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib' -AC_SUBST(AM_CPPFLAGS) +INCLUDES='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_INCLUDES) -I$(top_builddir)/lib -I$(top_srcdir)/lib' +AC_SUBST(INCLUDES) dnl We check for warnings here rather than with optimisations since we dnl want them to be _always_ enabled, to make sure the code is sane -- cgit v1.2.3