The end of if is at the wrong place.
Signed-off-by: Shakeel Butt <shakeel.butt@gmail.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
---
# HG changeset patch
# Parent 6c1b12c884b4521a940e079c8dfebc5d8e88d2e9
diff -r 6c1b12c884b4 configure
--- a/configure
+++ b/configure
@@ -2000,6 +2000,8 @@ stubdom=n
fi
+fi
+
if test -e "stubdom/configure"; then :
if test "x$stubdom" = "xy" || test "x$stubdom" =
"x" ; then
@@ -2011,9 +2013,6 @@ fi
-fi
-
-
# Check whether --enable-docs was given.
if test "${enable_docs+set}" = set; then :
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
On Sat, 2013-02-09 at 03:29 +0000, Shakeel Butt wrote:> The end of if is at the wrong place.Please can you describe what goes wrong with it where it is?> diff -r 6c1b12c884b4 configureI''m afraid this is a generate file, you need to instead edit configure.ac and/or m4/*.m4 (probably subsystem.m4) and rerun ./autogen.sh. Ian.
> Please can you describe what goes wrong with it where it is?Executing "./configure --enable-stubdom" doesn''t call stubdom/configure and I think the following patch will fix it correctly. Signed-off-by: Shakeel Butt <shakeel.butt@gmail.com> --- diff -r 6c1b12c884b4 m4/subsystem.m4 --- a/m4/subsystem.m4 +++ b/m4/subsystem.m4 @@ -39,10 +39,10 @@ AX_ENABLE_SUBSYSTEM([$1]) ],[ AX_DISABLE_SUBSYSTEM([$1]) ]) +]) AX_SUBSYSTEM_CONFIGURE([$1]) AC_SUBST($1) ]) -]) AC_DEFUN([AX_SUBSYSTEM_FINISH], [ AC_SUBST(SUBSYSTEMS)
> > diff -r 6c1b12c884b4 m4/subsystem.m4 > --- a/m4/subsystem.m4 > +++ b/m4/subsystem.m4 > @@ -39,10 +39,10 @@ AX_ENABLE_SUBSYSTEM([$1]) > ],[ > AX_DISABLE_SUBSYSTEM([$1]) > ]) > +]) > AX_SUBSYSTEM_CONFIGURE([$1]) > AC_SUBST($1) > ]) > -])BTW if ''arch_enable_stubdom=n'' and ''--enable-stubdom'' should the configure of stubdom be called?
On Mon, 2013-02-11 at 19:56 +0000, Shakeel Butt wrote:> > > > diff -r 6c1b12c884b4 m4/subsystem.m4 > > --- a/m4/subsystem.m4 > > +++ b/m4/subsystem.m4 > > @@ -39,10 +39,10 @@ AX_ENABLE_SUBSYSTEM([$1]) > > ],[ > > AX_DISABLE_SUBSYSTEM([$1]) > > ]) > > +]) > > AX_SUBSYSTEM_CONFIGURE([$1]) > > AC_SUBST($1) > > ]) > > -]) > > BTW if ''arch_enable_stubdom=n'' and ''--enable-stubdom'' should the > configure of stubdom be called?My intention was that --(enable|disable)-stubdom would always override arch_enable_stubdom, so yes it should be called. About the only person this would matter to is the person doing the port of mini-os to ARM... Ian.
>> BTW if ''arch_enable_stubdom=n'' and ''--enable-stubdom'' should the >> configure of stubdom be called? > > My intention was that --(enable|disable)-stubdom would always override > arch_enable_stubdom, so yes it should be called. >Thanks, then can you please review the changes I submitted against m4/subsystem.m4 because otherwise even if with "--enable-stubdom", the stubdom/configure is not being called. Shakeel
On Tue, 2013-02-12 at 10:10 +0000, Shakeel Butt wrote:> >> BTW if ''arch_enable_stubdom=n'' and ''--enable-stubdom'' should the > >> configure of stubdom be called? > > > > My intention was that --(enable|disable)-stubdom would always override > > arch_enable_stubdom, so yes it should be called. > > > Thanks, then can you please review the changes I submitted against > m4/subsystem.m4 because otherwise even if with "--enable-stubdom", the > stubdom/configure is not being called.Yes, it''s in my queue to look at. Thanks, Ian.
On Mon, 2013-02-11 at 13:22 +0000, Shakeel Butt wrote:> > Please can you describe what goes wrong with it where it is? > Executing "./configure --enable-stubdom" doesn''t call > stubdom/configure and I think the following patch will fix it > correctly.I rewrote your commit message as followed and checked this in. Please try and supply a usable commit message with a meaningful subject in the future. From f478258a4d3b5b9f27b265af8014617c53b83368 Mon Sep 17 00:00:00 2001 From: Shakeel Butt <shakeel.butt@gmail.com> Date: Mon, 11 Feb 2013 08:22:48 -0500 Subject: [PATCH] configure: configure a subsystem when explicitly requested. Executing "./configure --enable-stubdom" doesn''t call stubdom/configure, fix this. Signed-off-by: Shakeel Butt <shakeel.butt@gmail.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> --- configure | 6 +++--- m4/subsystem.m4 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 69803a7..06c0e99 100755 --- a/configure +++ b/configure @@ -2000,6 +2000,9 @@ stubdom=n fi +fi + + if test -e "stubdom/configure"; then : if test "x$stubdom" = "xy" || test "x$stubdom" = "x" ; then @@ -2011,9 +2014,6 @@ fi -fi - - # Check whether --enable-docs was given. if test "${enable_docs+set}" = set; then : diff --git a/m4/subsystem.m4 b/m4/subsystem.m4 index 9e1e61f..5e2eb58 100644 --- a/m4/subsystem.m4 +++ b/m4/subsystem.m4 @@ -39,10 +39,10 @@ AX_ENABLE_SUBSYSTEM([$1]) ],[ AX_DISABLE_SUBSYSTEM([$1]) ]) +]) AX_SUBSYSTEM_CONFIGURE([$1]) AC_SUBST($1) ]) -]) AC_DEFUN([AX_SUBSYSTEM_FINISH], [ AC_SUBST(SUBSYSTEMS) -- 1.7.2.5