Re: [Xen-devel] [GIT PULL v2] remove xend and libxen for 4.5

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2014-04-09 at 11:14 +0200, Olaf Hering wrote:
> On Wed, Apr 09, Ian Campbell wrote:
> 
> > On Wed, 2014-04-09 at 11:03 +0200, Olaf Hering wrote:
> > > On Wed, Apr 09, Ian Campbell wrote:
> > > 
> > > > Looks like some stray CONFIG_XENDs remained after rebasing for v2.
> > > > 
> > > > However you should also have rerun configure so CONFIG_XEND should not
> > > > be set anyway. The following takes care of the first issue.
> > > 
> > > Thanks, with this patch the rpmbuild makes progress past the 'make' call.
> > 
> > Thanks, I'll take this as a Tested-by: Olaf Hering <olaf@xxxxxxxxx> if
> > you don't mind.
> 
> Yes, please.
> 
> > How was CONFIG_XEND getting set in your build though?
> 
> I had configure --enable-xend in my rpm spec file.

But nothing should understand enable-xend any more!

Ah, I also missed the change to docs/configure.ac. Sigh....

-----8<---------

From c781e81173de31077ac79d67aab7ce4879636bc3 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Wed, 9 Apr 2014 09:26:23 +0100
Subject: [PATCH v2] docs: remove stray CONFIG_XENDs and configure option from
 docs.

These were added by 7dbfc2f8b054 "docs: Honour --{en, dis}able-xend when
building docs" between v1 and the (eventually committed) v2 of 9e8672f1c36d
"tools: remove xend and associated python modules" and were missed when
rebasing for v2.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Tested-by: Olaf Hering <olaf@xxxxxxxxx>
---
v2: Also remove option from docs/configure.
---
 config/Docs.mk.in |    3 ---
 docs/Makefile     |    2 --
 docs/configure    |   34 ----------------------------------
 docs/configure.ac |    3 ---
 4 files changed, 42 deletions(-)

diff --git a/config/Docs.mk.in b/config/Docs.mk.in
index 03fac60..a2a72fd 100644
--- a/config/Docs.mk.in
+++ b/config/Docs.mk.in
@@ -12,6 +12,3 @@ POD2HTML            := @POD2HTML@
 POD2TEXT            := @POD2TEXT@
 MARKDOWN            := @MARKDOWN@
 PERL                := @PERL@
-
-# Subsets of documentation to build
-CONFIG_XEND         := @xend@
diff --git a/docs/Makefile b/docs/Makefile
index 7cd7440..5153bcb 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -9,10 +9,8 @@ DOC_ARCHES      := arm x86_32 x86_64
 # Documentation sources to build
 MAN1SRC-y := $(wildcard man/xl*.pod.1)
 MAN1SRC-y += $(wildcard man/xenstore*.pod.1)
-MAN1SRC-$(CONFIG_XEND) += man/xm.pod.1
 
 MAN5SRC-y := $(wildcard man/xl*.pod.5)
-MAN5SRC-$(CONFIG_XEND) += man/xend-config.sxp.pod.5 man/xmdomain.cfg.pod.5
 
 MARKDOWNSRC-y := $(wildcard misc/*.markdown)
 
diff --git a/docs/configure b/docs/configure
index c54f431..d76e4d4 100755
--- a/docs/configure
+++ b/docs/configure
@@ -588,7 +588,6 @@ ac_unique_file="misc/xen-command-line.markdown"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 PERL
-xend
 MARKDOWN
 POD2TEXT
 POD2HTML
@@ -635,7 +634,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_xend
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1251,13 +1249,6 @@ if test -n "$ac_init_help"; then
    esac
   cat <<\_ACEOF
 
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-xend           Enable xend toolstack documentation (default is
-                          DISABLED)
-
 Some influential environment variables:
   FIG2DEV     Path to fig2dev tool
   POD2MAN     Path to pod2man tool
@@ -1996,31 +1987,6 @@ $as_echo "$as_me: WARNING: markdown is not available so 
some documentation won't
 fi
 
 
-# Enable/disable options
-
-# Check whether --enable-xend was given.
-if test "${enable_xend+set}" = set; then :
-  enableval=$enable_xend;
-fi
-
-
-if test "x$enable_xend" = "xno"; then :
-
-    ax_cv_xend="n"
-
-elif test "x$enable_xend" = "xyes"; then :
-
-    ax_cv_xend="y"
-
-elif test -z $ax_cv_xend; then :
-
-    ax_cv_xend="n"
-
-fi
-xend=$ax_cv_xend
-
-
-
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
diff --git a/docs/configure.ac b/docs/configure.ac
index 7e6d1b1..e545b00 100644
--- a/docs/configure.ac
+++ b/docs/configure.ac
@@ -19,9 +19,6 @@ AX_DOCS_TOOL_PROG([POD2HTML], [pod2html])
 AX_DOCS_TOOL_PROG([POD2TEXT], [pod2text])
 AX_DOCS_TOOL_PROGS([MARKDOWN], [markdown], [markdown markdown_py])
 
-# Enable/disable options
-AX_ARG_DEFAULT_DISABLE([xend], [Enable xend toolstack documentation])
-
 AC_ARG_VAR([PERL], [Path to Perl parser])
 AX_PATH_PROG_OR_FAIL([PERL], [perl])
 
-- 
1.7.10.4




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel