From patchwork Thu Jan 21 18:48:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 43448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C1613B7D17 for ; Fri, 22 Jan 2010 06:03:31 +1100 (EST) Received: from localhost ([127.0.0.1]:39963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY2Hk-0001sr-AD for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2010 14:01:40 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NY25w-0006tW-7L for qemu-devel@nongnu.org; Thu, 21 Jan 2010 13:49:28 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NY25q-0006nr-Ky for qemu-devel@nongnu.org; Thu, 21 Jan 2010 13:49:27 -0500 Received: from [199.232.76.173] (port=59178 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY25q-0006nT-Dq for qemu-devel@nongnu.org; Thu, 21 Jan 2010 13:49:22 -0500 Received: from e37.co.us.ibm.com ([32.97.110.158]:53013) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NY25p-0000wH-Q6 for qemu-devel@nongnu.org; Thu, 21 Jan 2010 13:49:22 -0500 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e37.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o0LIluFs005878 for ; Thu, 21 Jan 2010 11:47:56 -0700 Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o0LIn2vd104272 for ; Thu, 21 Jan 2010 11:49:02 -0700 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o0LIn101028848 for ; Thu, 21 Jan 2010 11:49:01 -0700 Received: from localhost.localdomain (sig-9-65-42-139.mts.ibm.com [9.65.42.139]) by d03av05.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o0LImvVq028674; Thu, 21 Jan 2010 11:49:00 -0700 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Thu, 21 Jan 2010 12:48:50 -0600 Message-Id: <1264099733-29666-2-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1264099733-29666-1-git-send-email-aliguori@us.ibm.com> References: <1264099733-29666-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: John Cooper , Anthony Liguori , Gerd Hoffman Subject: [Qemu-devel] [PATCH 1/4] Support --confdir in configure to specify path to configuration files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- configure | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) 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