From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NgYpD-0006Zn-U3 for qemu-devel@nongnu.org; Sun, 14 Feb 2010 02:23:27 -0500 Received: from [199.232.76.173] (port=57019 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NgYpD-0006ZY-Dy for qemu-devel@nongnu.org; Sun, 14 Feb 2010 02:23:27 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NgYpC-0002o8-Qd for qemu-devel@nongnu.org; Sun, 14 Feb 2010 02:23:27 -0500 Received: from mail-pz0-f187.google.com ([209.85.222.187]:64116) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NgYpC-0002o4-Hl for qemu-devel@nongnu.org; Sun, 14 Feb 2010 02:23:26 -0500 Received: by pzk17 with SMTP id 17so2939472pzk.4 for ; Sat, 13 Feb 2010 23:23:25 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 14 Feb 2010 09:23:05 +0200 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] [PATCH] Give sdl-config higher priority than pkg-config List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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" -- 1.6.2.4