move --srcdir detection earlier

This will help getting config.guess and config.sub from the srcdir.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Paolo Bonzini 2010-12-23 11:44:00 +01:00 committed by Blue Swirl
parent ddc0966462
commit ca4deeb13a
1 changed files with 7 additions and 5 deletions

12
configure vendored
View File

@ -75,6 +75,7 @@ path_of() {
} }
# default parameters # default parameters
source_path=`dirname "$0"`
cpu="" cpu=""
interp_prefix="/usr/gnemul/qemu-%M" interp_prefix="/usr/gnemul/qemu-%M"
static="no" static="no"
@ -182,6 +183,8 @@ for opt do
;; ;;
--cc=*) CC="$optarg" --cc=*) CC="$optarg"
;; ;;
--source-path=*) source_path="$optarg"
;;
--cpu=*) cpu="$optarg" --cpu=*) cpu="$optarg"
;; ;;
--extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS" --extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS"
@ -228,6 +231,9 @@ QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
QEMU_INCLUDES="-I. -I\$(SRC_PATH)" QEMU_INCLUDES="-I. -I\$(SRC_PATH)"
LDFLAGS="-g $LDFLAGS" LDFLAGS="-g $LDFLAGS"
# make source path absolute
source_path=`cd "$source_path"; pwd`
check_define() { check_define() {
cat > $TMPC <<EOF cat > $TMPC <<EOF
#if !defined($1) #if !defined($1)
@ -478,10 +484,6 @@ if test "$mingw32" = "yes" ; then
confsuffix="" confsuffix=""
fi fi
# find source path
source_path=`dirname "$0"`
source_path=`cd "$source_path"; pwd`
werror="" werror=""
for opt do for opt do
@ -493,7 +495,7 @@ for opt do
;; ;;
--interp-prefix=*) interp_prefix="$optarg" --interp-prefix=*) interp_prefix="$optarg"
;; ;;
--source-path=*) source_path="$optarg" --source-path=*)
;; ;;
--cross-prefix=*) --cross-prefix=*)
;; ;;