Patchwork [1/4] Support --confdir in configure to specify path to configuration files

login
register
mail settings
Submitter Anthony Liguori
Date Jan. 21, 2010, 6:48 p.m.
Message ID <1264099733-29666-2-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/43448/
State New
Headers show

Comments

Anthony Liguori - Jan. 21, 2010, 6:48 p.m.
The default value is ${prefix}/etc/qemu.  --confdir can be used to override the
default to an absolute path.  The expectation is that when installed to /usr,
 --confdir=/etc/qemu will be used.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 configure |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
Paolo Bonzini - Jan. 22, 2010, 12:43 p.m.
On 01/21/2010 07:48 PM, Anthony Liguori wrote:
> --confdir can be used to override the
> default to an absolute path.  The expectation is that when installed to /usr,
>   --confdir=/etc/qemu will be used.

Why not --sysconfdir?  There are already several differences between 
Autoconf options and QEMU configure options, however unlike the others 
this one would be used by basically all distros.

Paolo
Anthony Liguori - Jan. 22, 2010, 2:39 p.m.
On 01/22/2010 06:43 AM, Paolo Bonzini wrote:
> On 01/21/2010 07:48 PM, Anthony Liguori wrote:
>> --confdir can be used to override the
>> default to an absolute path.  The expectation is that when installed 
>> to /usr,
>>   --confdir=/etc/qemu will be used.
>
> Why not --sysconfdir?  There are already several differences between 
> Autoconf options and QEMU configure options, however unlike the others 
> this one would be used by basically all distros.

Wasn't 100% sure on the proper naming.  sysconfdir works for me.

Regards,

Anthony Liguori

> Paolo

Patch

diff --git a/configure b/configure
index 5631bbb..e86b27e 100755
--- a/configure
+++ b/configure
@@ -32,6 +32,7 @@  cpu=""
 prefix=""
 interp_prefix="/usr/gnemul/qemu-%M"
 static="no"
+confdir=""
 sparc_cpu=""
 cross_prefix=""
 cc="gcc"
@@ -453,6 +454,8 @@  for opt do
   ;;
   --static) static="yes"
   ;;
+  --confdir) confdir="$optarg"
+  ;;
   --disable-sdl) sdl="no"
   ;;
   --enable-sdl) sdl="yes"
@@ -686,6 +689,7 @@  echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"
 echo "  --make=MAKE              use specified make [$make]"
 echo "  --install=INSTALL        use specified install [$install]"
 echo "  --static                 enable static build [$static]"
+echo "  --confdir=PATH           install config in PATH"
 echo "  --enable-debug-tcg       enable TCG debugging"
 echo "  --disable-debug-tcg      disable TCG debugging (default)"
 echo "  --enable-debug           enable common debug build options"
@@ -1828,6 +1832,7 @@  if test "$mingw32" = "yes" ; then
   fi
   mansuffix=""
   datasuffix=""
+  confsuffix=""
   docsuffix=""
   binsuffix=""
 else
@@ -1838,6 +1843,9 @@  else
   datasuffix="/share/qemu"
   docsuffix="/share/doc/qemu"
   binsuffix="/bin"
+  if test -z "$confdir" ; then
+      confdir="${prefix}/etc/qemu"
+  fi
 fi
 
 echo "Install prefix    $prefix"
@@ -1914,6 +1922,7 @@  printf " '%s'" "$0" "$@" >> $config_host_mak
 echo >> $config_host_mak
 
 echo "CONFIG_QEMU_SHAREDIR=\"$prefix$datasuffix\"" >> $config_host_mak
+echo "CONFIG_QEMU_CONFDIR=\"$confdir\"" >> $config_host_mak
 
 case "$cpu" in
   i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64)
@@ -2159,6 +2168,7 @@  echo "prefix=$prefix" >> $config_host_mak
 echo "bindir=\${prefix}$binsuffix" >> $config_host_mak
 echo "mandir=\${prefix}$mansuffix" >> $config_host_mak
 echo "datadir=\${prefix}$datasuffix" >> $config_host_mak
+echo "confdir=$confdir" >> $config_host_mak
 echo "docdir=\${prefix}$docsuffix" >> $config_host_mak
 echo "MAKE=$make" >> $config_host_mak
 echo "INSTALL=$install" >> $config_host_mak