aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMarcus Comstedt2018-12-03 20:34:58 +0100
committerMarcus Comstedt2018-12-04 20:12:31 +0100
commite3da5e043c873c241d142b688a646b268371a852 (patch)
treebdb91ce7bd9f33752847a16e5b888f01087626d4 /configure
parenteea066b89b3279d8a754f3d3da1ac8a190904196 (diff)
downloadscummvm-rg350-e3da5e043c873c241d142b688a646b268371a852.tar.gz
scummvm-rg350-e3da5e043c873c241d142b688a646b268371a852.tar.bz2
scummvm-rg350-e3da5e043c873c241d142b688a646b268371a852.zip
BUILD: Add $DEFINES and $INCLUDES in cc_check()
When actually compiling things Makefile.common adds these variables to the command line, so they should be there when testing if something can be compiled as well, otherwise we could get both false negatives and positives. This fixes detection of zlib and MAD on Dreamcast, when installed in $RONINDIR.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 493573f02c..0152e9c95c 100755
--- a/configure
+++ b/configure
@@ -283,12 +283,12 @@ cc_check_no_clean() {
echo >> "$TMPLOG"
cat "$TMPC" >> "$TMPLOG"
echo >> "$TMPLOG"
- echo "$CXX $LDFLAGS $CXXFLAGS $TMPC -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
+ echo "$CXX $LDFLAGS $CXXFLAGS $DEFINES $INCLUDES $TMPC -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
rm -f "$TMPO$HOSTEXEEXT"
if test "-c" = "$*" ; then
- ( $CXX $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+ ( $CXX $CXXFLAGS $DEFINES $INCLUDES "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
else
- ( $CXX $LDFLAGS $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+ ( $CXX $LDFLAGS $CXXFLAGS $DEFINES $INCLUDES "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
fi
TMPR="$?"
echo "return code: $TMPR" >> "$TMPLOG"