Patchwork [1/2] configure: add --localstatedir

login
register
mail settings
Submitter Luiz Capitulino
Date Oct. 3, 2012, 9:35 p.m.
Message ID <1349300158-19113-2-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/188938/
State New
Headers show

Comments

Luiz Capitulino - Oct. 3, 2012, 9:35 p.m.
Next commit wants to use it.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 configure | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
Michael Roth - Oct. 4, 2012, 3:39 p.m.
On Wed, Oct 03, 2012 at 06:35:57PM -0300, Luiz Capitulino wrote:
> Next commit wants to use it.
> 
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

> ---
>  configure | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 8f99b7b..dab07d6 100755
> --- a/configure
> +++ b/configure
> @@ -184,6 +184,7 @@ libdir="\${prefix}/lib"
>  libexecdir="\${prefix}/libexec"
>  includedir="\${prefix}/include"
>  sysconfdir="\${prefix}/etc"
> +local_statedir="\${prefix}/var"
>  confsuffix="/qemu"
>  slirp="yes"
>  fmod_lib=""
> @@ -552,6 +553,7 @@ EOF
>    qemu_docdir="\${prefix}"
>    bindir="\${prefix}"
>    sysconfdir="\${prefix}"
> +  local_statedir="\${prefix}"
>    confsuffix=""
>    libs_qga="-lws2_32 -lwinmm -lpowrprof $libs_qga"
>  fi
> @@ -628,7 +630,9 @@ for opt do
>    ;;
>    --sysconfdir=*) sysconfdir="$optarg"
>    ;;
> -  --sbindir=*|--sharedstatedir=*|--localstatedir=*|\
> +  --localstatedir=*) local_statedir="$optarg"
> +  ;;
> +  --sbindir=*|--sharedstatedir=*|\
>    --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
>    --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
>      # These switches are silently ignored, for compatibility with
> @@ -1022,6 +1026,7 @@ echo "  --datadir=PATH           install firmware in PATH$confsuffix"
>  echo "  --docdir=PATH            install documentation in PATH$confsuffix"
>  echo "  --bindir=PATH            install binaries in PATH"
>  echo "  --sysconfdir=PATH        install config in PATH$confsuffix"
> +echo "  --localstatedir=PATH     install local state in PATH"
>  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)"
> @@ -3086,6 +3091,7 @@ 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 "Manual directory  `eval echo $mandir`"
>  echo "ELF interp prefix $interp_prefix"
> @@ -3194,6 +3200,7 @@ 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
>  echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
> 
>  echo "ARCH=$ARCH" >> $config_host_mak
> -- 
> 1.7.12.315.g682ce8b
>

Patch

diff --git a/configure b/configure
index 8f99b7b..dab07d6 100755
--- a/configure
+++ b/configure
@@ -184,6 +184,7 @@  libdir="\${prefix}/lib"
 libexecdir="\${prefix}/libexec"
 includedir="\${prefix}/include"
 sysconfdir="\${prefix}/etc"
+local_statedir="\${prefix}/var"
 confsuffix="/qemu"
 slirp="yes"
 fmod_lib=""
@@ -552,6 +553,7 @@  EOF
   qemu_docdir="\${prefix}"
   bindir="\${prefix}"
   sysconfdir="\${prefix}"
+  local_statedir="\${prefix}"
   confsuffix=""
   libs_qga="-lws2_32 -lwinmm -lpowrprof $libs_qga"
 fi
@@ -628,7 +630,9 @@  for opt do
   ;;
   --sysconfdir=*) sysconfdir="$optarg"
   ;;
-  --sbindir=*|--sharedstatedir=*|--localstatedir=*|\
+  --localstatedir=*) local_statedir="$optarg"
+  ;;
+  --sbindir=*|--sharedstatedir=*|\
   --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
   --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
     # These switches are silently ignored, for compatibility with
@@ -1022,6 +1026,7 @@  echo "  --datadir=PATH           install firmware in PATH$confsuffix"
 echo "  --docdir=PATH            install documentation in PATH$confsuffix"
 echo "  --bindir=PATH            install binaries in PATH"
 echo "  --sysconfdir=PATH        install config in PATH$confsuffix"
+echo "  --localstatedir=PATH     install local state in PATH"
 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)"
@@ -3086,6 +3091,7 @@  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 "Manual directory  `eval echo $mandir`"
 echo "ELF interp prefix $interp_prefix"
@@ -3194,6 +3200,7 @@  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
 echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
 
 echo "ARCH=$ARCH" >> $config_host_mak