From e3da5e043c873c241d142b688a646b268371a852 Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Mon, 3 Dec 2018 20:34:58 +0100 Subject: 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. --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') 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" -- cgit v1.2.3