Include pkgconfig CFLAGS into our CPPFLAGS instead as they're really preprocessor options (as opposed to C compilation options)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3571 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-01-27 17:12:48 +00:00
parent 0180eea2aa
commit 1502e29c80
1 changed files with 5 additions and 2 deletions

View File

@ -239,8 +239,11 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DLOCALEDIR=\"\\\"\${localedir}\\\"\""
WZ_CPPFLAGS="${WZ_CPPFLAGS} -DYY_NO_INPUT"
CPPFLAGS="${CPPFLAGS} ${WZ_CPPFLAGS} -I\$(top_srcdir)"
CFLAGS="${SDL_CFLAGS} ${PNG_CFLAGS} ${OGGVORBIS_CFLAGS} ${OPENAL_CFLAGS} ${OPENGL_CFLAGS} ${CFLAGS} ${WZ_CFLAGS}"
# Purposefully including the SDL, PNG, OGGVORBIS, OPENAL and OPENGL CFLAGS into
# the CPPFLAGS here as they're really preprocessor options, not C compilation
# options.
CPPFLAGS="${CPPFLAGS} ${WZ_CPPFLAGS} -I\$(top_srcdir) ${SDL_CFLAGS} ${PNG_CFLAGS} ${OGGVORBIS_CFLAGS} ${OPENAL_CFLAGS} ${OPENGL_CFLAGS}"
CFLAGS="${CFLAGS} ${WZ_CFLAGS}"
AC_CONFIG_HEADER([config.h])