|
 |
9ae3a8 |
From a7b1e640330bf53d45d9d68af84df13917907c35 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 31 Jul 2013 14:03:24 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 03/28] configure: don't save any fixed local_statedir for win32
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1375279407-13573-4-git-send-email-lersek@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 52865
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 3/6] configure: don't save any fixed local_statedir for win32
|
|
|
9ae3a8 |
Bugzilla: 964304
|
|
|
9ae3a8 |
RH-Acked-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
... because now we can get the dynamic value with
|
|
|
9ae3a8 |
qemu_get_local_state_pathname().
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The only user of the fixed value was the guest agent, which we've moved to
|
|
|
9ae3a8 |
qemu_get_local_state_pathname() in the previous patch.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
(cherry picked from commit 5a699bbbf300902141d2458682d05cd310d7a07f)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
configure | 12 ++++++++----
|
|
|
9ae3a8 |
1 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
configure | 12 ++++++++----
|
|
|
9ae3a8 |
1 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/configure b/configure
|
|
|
9ae3a8 |
index a71e8a1..02e483d 100755
|
|
|
9ae3a8 |
--- a/configure
|
|
|
9ae3a8 |
+++ b/configure
|
|
|
9ae3a8 |
@@ -588,7 +588,7 @@ EOF
|
|
|
9ae3a8 |
qemu_docdir="\${prefix}"
|
|
|
9ae3a8 |
bindir="\${prefix}"
|
|
|
9ae3a8 |
sysconfdir="\${prefix}"
|
|
|
9ae3a8 |
- local_statedir="\${prefix}"
|
|
|
9ae3a8 |
+ local_statedir=
|
|
|
9ae3a8 |
confsuffix=""
|
|
|
9ae3a8 |
libs_qga="-lws2_32 -lwinmm -lpowrprof $libs_qga"
|
|
|
9ae3a8 |
fi
|
|
|
9ae3a8 |
@@ -1085,7 +1085,7 @@ echo " --docdir=PATH install documentation in PATH$confsuffix"
|
|
|
9ae3a8 |
echo " --bindir=PATH install binaries in PATH"
|
|
|
9ae3a8 |
echo " --libdir=PATH install libraries in PATH"
|
|
|
9ae3a8 |
echo " --sysconfdir=PATH install config in PATH$confsuffix"
|
|
|
9ae3a8 |
-echo " --localstatedir=PATH install local state in PATH"
|
|
|
9ae3a8 |
+echo " --localstatedir=PATH install local state in PATH (set at runtime on win32)"
|
|
|
9ae3a8 |
echo " --with-confsuffix=SUFFIX suffix for QEMU data inside datadir and sysconfdir [$confsuffix]"
|
|
|
9ae3a8 |
echo " --enable-debug-tcg enable TCG debugging"
|
|
|
9ae3a8 |
echo " --disable-debug-tcg disable TCG debugging (default)"
|
|
|
9ae3a8 |
@@ -3495,10 +3495,12 @@ echo "library directory `eval echo $libdir`"
|
|
|
9ae3a8 |
echo "libexec directory `eval echo $libexecdir`"
|
|
|
9ae3a8 |
echo "include directory `eval echo $includedir`"
|
|
|
9ae3a8 |
echo "config directory `eval echo $sysconfdir`"
|
|
|
9ae3a8 |
-echo "local state directory `eval echo $local_statedir`"
|
|
|
9ae3a8 |
if test "$mingw32" = "no" ; then
|
|
|
9ae3a8 |
+echo "local state directory `eval echo $local_statedir`"
|
|
|
9ae3a8 |
echo "Manual directory `eval echo $mandir`"
|
|
|
9ae3a8 |
echo "ELF interp prefix $interp_prefix"
|
|
|
9ae3a8 |
+else
|
|
|
9ae3a8 |
+echo "local state directory queried at runtime"
|
|
|
9ae3a8 |
fi
|
|
|
9ae3a8 |
echo "Source path $source_path"
|
|
|
9ae3a8 |
echo "C compiler $cc"
|
|
|
9ae3a8 |
@@ -3620,7 +3622,9 @@ echo "sysconfdir=$sysconfdir" >> $config_host_mak
|
|
|
9ae3a8 |
echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
|
|
|
9ae3a8 |
echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
|
|
|
9ae3a8 |
echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
|
|
|
9ae3a8 |
-echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
|
|
|
9ae3a8 |
+if test "$mingw32" = "no" ; then
|
|
|
9ae3a8 |
+ echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
|
|
|
9ae3a8 |
+fi
|
|
|
9ae3a8 |
echo "qemu_helperdir=$libexecdir" >> $config_host_mak
|
|
|
9ae3a8 |
echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak
|
|
|
9ae3a8 |
echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|