From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYccB-0003GA-T3 for qemu-devel@nongnu.org; Wed, 14 Nov 2012 08:02:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYcc8-00083d-Q5 for qemu-devel@nongnu.org; Wed, 14 Nov 2012 08:02:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYcc8-00083E-IX for qemu-devel@nongnu.org; Wed, 14 Nov 2012 08:02:44 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAED2hO1025168 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Nov 2012 08:02:43 -0500 From: Gerd Hoffmann Date: Wed, 14 Nov 2012 14:02:35 +0100 Message-Id: <1352898161-28960-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1352898161-28960-1-git-send-email-kraxel@redhat.com> References: <1352898161-28960-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/7] 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 | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 7290f50..e6fe4f8 100755 --- a/configure +++ b/configure @@ -2121,11 +2121,10 @@ 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\$(SRC_PATH)/pixman/pixman -I\$(BUILD_DIR)/pixman/pixman" + pixman_libs="-L\$(BUILD_DIR)/pixman/pixman/.libs -lpixman-1" fi -QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags" -libs_softmmu="$libs_softmmu $pixman_libs" ########################################## # libcap probe @@ -3137,6 +3136,10 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then roms="$roms spapr-rtas" fi +# add pixman flags after all config tests are done +QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags" +libs_softmmu="$libs_softmmu $pixman_libs" + echo "Install prefix $prefix" echo "BIOS directory `eval echo $qemu_datadir`" echo "binary directory `eval echo $bindir`" @@ -4154,7 +4157,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