cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-configure-don-t-save-any-fixed-local_statedir-for-wi.patch

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