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