From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYC4Z-0002Tj-IJ for qemu-devel@nongnu.org; Tue, 13 Nov 2012 03:42:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYC4W-000127-FF for qemu-devel@nongnu.org; Tue, 13 Nov 2012 03:42:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYC4W-00011g-7Y for qemu-devel@nongnu.org; Tue, 13 Nov 2012 03:42:16 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAD8gFiM028536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 13 Nov 2012 03:42:15 -0500 From: Gerd Hoffmann Date: Tue, 13 Nov 2012 09:42:08 +0100 Message-Id: <1352796133-956-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1352796133-956-1-git-send-email-kraxel@redhat.com> References: <1352796133-956-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] pixman: add output dir to include path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Needed to make sure the (generated) pixman-version.h file is found. Based on a patch from Blue Swirl. Signed-off-by: Gerd Hoffmann --- configure | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 7290f50..18faded 100755 --- a/configure +++ b/configure @@ -2121,8 +2121,9 @@ else echo " git submodule update --init pixman" exit 1 fi - pixman_cflags="-I${source_path}/pixman/pixman" - pixman_libs="-Lpixman/pixman/.libs -lpixman-1" + mkdir -p pixman/pixman + pixman_cflags="-I${source_path}/pixman/pixman -I$(pwd)/pixman/pixman" + pixman_libs="-L$(pwd)/pixman/pixman/.libs -lpixman-1" fi QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags" libs_softmmu="$libs_softmmu $pixman_libs" @@ -4154,7 +4155,6 @@ DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace" -DIRS="$DIRS pixman" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile" -- 1.7.1