diff options
| author | Darren Salt <devspam@moreofthesa.me.uk> | 2013-09-18 13:35:53 +0100 |
|---|---|---|
| committer | Darren Salt <devspam@moreofthesa.me.uk> | 2013-09-18 13:35:53 +0100 |
| commit | 8618aff6751cae181f7a07f8e0aecd327a4cfb85 (patch) | |
| tree | dc4e9fa47d2042378e6e20e5aab013d15b3b2dcf | |
| parent | 4c6876c9ebbaa7e793219d20a8528d939149563d (diff) | |
| download | xine-lib-8618aff6751cae181f7a07f8e0aecd327a4cfb85.tar.gz xine-lib-8618aff6751cae181f7a07f8e0aecd327a4cfb85.tar.bz2 | |
Revert replacement of INCLUDES with AM_CPPFLAGS.
| -rw-r--r-- | configure.ac | 6 |
1 files 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 |