On (23/03/15 14:49), Simo Sorce wrote:
On Mon, 2015-03-23 at 12:03 -0400, Simo Sorce wrote:
> On Mon, 2015-03-23 at 16:28 +0100, Lukas Slebodnik wrote:
> > On (23/03/15 11:04), Simo Sorce wrote:
> > >For some reason gss-proxy started to fail configure step.
> > >
> > >This patch fixes it for me.
> > >
> > >--
> > >Simo Sorce * Red Hat, Inc * New York
> >
> > >From 4efb5ab5686d7bfe00e2a387ba66de4e43ddf317 Mon Sep 17 00:00:00 2001
> > >From: Simo Sorce <simo(a)redhat.com>
> > >Date: Sun, 22 Mar 2015 16:53:50 -0400
> > >Subject: [PATCH] Fix Makefile issues raise by latest autotools
> > >
> > >---
> > > proxy/Makefile.am | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > >diff --git a/proxy/Makefile.am b/proxy/Makefile.am
> > >index
63cada6ae67e69c726c34503ef23a19b5750aa63..2dcd5519e09f4de994a4046172464fe5ceb12966 100644
> > >--- a/proxy/Makefile.am
> > >+++ b/proxy/Makefile.am
> > >@@ -242,7 +242,7 @@ replace_script = \
> > > $(edit_cmd) $${srcdir}$@.in >$@.tmp; \
> > > mv $@.tmp $@
> > >
> > >-EXTRA_DIST += \
> > >+EXTRA_DIST = \
> > > systemd/gssproxy.service.in \
> > > examples/gssproxy.conf.in \
> > > examples/mech.in
> >
> > I cannot see any occurence of automake variable "EXTRA_DIST"
> > in proxy/Makefile.am. (git HEAD)
> >
> > sh$ git grep -n EXTRA_DIST
> > proxy/man/Makefile.am:17:EXTRA_DIST = $(man_MANS:%=%.xml) $(wildcard
$(srcdir)/include/*.xml)
> > proxy/man/Makefile.am:66:#EXTRA_DIST += \
> >
> > The bug is in patch "[PATCH] Fix variable replacement in non config
files"
> > and is not related to the latest autotools.
> >
> > BTW patch is right, because you cannot append values
> > unless automake variable vas defined.
>
> Ahh right I had forgotten I introduced that change in a recent patch, as
> the patch had been laying there for months.
>
> I retire this patch and I pushed to my review branch a modified "[PATCH]
> Fix variable replacement in non config files" patch.
>
> I am dealing with an make rpms problem now, once I have a fix for that I
> will do a few testa dn then push the lot to master and clear all related
> tickets.
>
> Thank you all for the reviews.
Turned out I had to change the original patch quite a bit, and add a
patch to fix the contrib spec file.
Here they are.
Simo.
--
Simo Sorce * Red Hat, Inc * New York
From 41ede96d17905387160b0ec83176b7d78c0bd8fa Mon Sep 17 00:00:00
2001
From: Simo Sorce <simo(a)redhat.com>
Date: Fri, 9 Jan 2015 14:56:44 -0500
Subject: [PATCH 2/2] Fix variable replacement in non config files
Fixes: #132
Signed-off-by: Simo Sorce <simo(a)redhat.com>
---
From 9fb8248d1c4e203ebe1008ecb226164a989e25bc Mon Sep 17 00:00:00
2001
From: Simo Sorce <simo(a)redhat.com>
Date: Mon, 23 Mar 2015 14:21:01 -0400
Subject: [PATCH 1/2] Default to systemd initscript in rpm spec file
Attached files should be applied on top of these two patches
and fix few build issies.
I decided to not install example files with "make install"
- files were added to automake variable noinst_DATA, so they
are created with "make all" target
I tested a build on CentOS 7.0. IIRC older distributions does not have
sufficient version of kerberos.
BTW We use $(MKDIR_P) on el6 in sssd. But If there is distribution which
does not have older autotools I can provide fallback.
LS