From patchwork Sun Feb 14 07:23:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Give sdl-config higher priority than pkg-config Date: Sat, 13 Feb 2010 21:23:05 -0000 From: Blue Swirl X-Patchwork-Id: 45289 Message-Id: To: qemu-devel On OpenBSD, pkg-config sdl --cflags forgets to add -I/usr/local/include which is needed for iconv.h (included from SDL.h). This makes SDL detection fail. Try sdl-config first, only if it fails try pkg-config. Signed-off-by: Blue Swirl --- configure | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0a84b0e..aee1f2c 100755 --- a/configure +++ b/configure @@ -1036,12 +1036,12 @@ fi ########################################## # SDL probe -if $pkgconfig sdl --modversion >/dev/null 2>&1; then - sdlconfig="$pkgconfig sdl" - _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` -elif has sdl-config; then +if has sdl-config; then sdlconfig='sdl-config' _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'` +elif $pkgconfig sdl --modversion >/dev/null 2>&1; then + sdlconfig="$pkgconfig sdl" + _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` else if test "$sdl" = "yes" ; then feature_not_found "sdl"