Re: [PATCH] Makefile.am: add include dir for AC_CONFIG_MACRO_DIR to work

2018-06-18 Thread Pekka Paalanen
On Mon, 18 Jun 2018 08:23:42 +0100
Emil Velikov  wrote:

> On 15 June 2018 at 15:06, Maciej Wolny  wrote:
> > On 05/06/18 11:53, Maciej Wolny wrote:  
> >> da331647269ee9d73c4008ae901d107320bdc8d1 added a compatiblity macro for
> >> old versions of pkg-config. However, the file in which that macro
> >> resides was not included. From the autoconf docs: "Note that if you use
> >> aclocal from Automake to generate aclocal.m4, you must also set
> >> ACLOCAL_AMFLAGS = -I dir in your top-level Makefile.am.".
> >> ---
> >>  Makefile.am | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/Makefile.am b/Makefile.am
> >> index 4b9a901..1aa13cf 100644
> >> --- a/Makefile.am
> >> +++ b/Makefile.am
> >> @@ -1,3 +1,5 @@
> >> +ACLOCAL_AMFLAGS = -I m4
> >> +
> >>  unstable_protocols =  
> >>\
> >>   unstable/pointer-gestures/pointer-gestures-unstable-v1.xml   
> >>\
> >>   unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml   
> >>\
> >>  
> >
> > I'm sorry, I didn't specify - this is a patch for wayland-protocols.  
> That helps clear some confusion. Thanks
> 
> Reviewed-by: Emil Velikov 

Pushed:
   c5f0f1a..dae2a3d  master -> master


Thanks,
pq


pgpIqdOsCTfik.pgp
Description: OpenPGP digital signature
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel


Re: [PATCH] Makefile.am: add include dir for AC_CONFIG_MACRO_DIR to work

2018-06-18 Thread Emil Velikov
On 15 June 2018 at 15:06, Maciej Wolny  wrote:
> On 05/06/18 11:53, Maciej Wolny wrote:
>> da331647269ee9d73c4008ae901d107320bdc8d1 added a compatiblity macro for
>> old versions of pkg-config. However, the file in which that macro
>> resides was not included. From the autoconf docs: "Note that if you use
>> aclocal from Automake to generate aclocal.m4, you must also set
>> ACLOCAL_AMFLAGS = -I dir in your top-level Makefile.am.".
>> ---
>>  Makefile.am | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index 4b9a901..1aa13cf 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -1,3 +1,5 @@
>> +ACLOCAL_AMFLAGS = -I m4
>> +
>>  unstable_protocols =
>>  \
>>   unstable/pointer-gestures/pointer-gestures-unstable-v1.xml 
>>  \
>>   unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml 
>>  \
>>
>
> I'm sorry, I didn't specify - this is a patch for wayland-protocols.
That helps clear some confusion. Thanks

Reviewed-by: Emil Velikov 

-Emil
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel


Re: [PATCH] Makefile.am: add include dir for AC_CONFIG_MACRO_DIR to work

2018-06-15 Thread Maciej Wolny
On 05/06/18 11:53, Maciej Wolny wrote:
> da331647269ee9d73c4008ae901d107320bdc8d1 added a compatiblity macro for
> old versions of pkg-config. However, the file in which that macro
> resides was not included. From the autoconf docs: "Note that if you use
> aclocal from Automake to generate aclocal.m4, you must also set
> ACLOCAL_AMFLAGS = -I dir in your top-level Makefile.am.".
> ---
>  Makefile.am | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 4b9a901..1aa13cf 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,3 +1,5 @@
> +ACLOCAL_AMFLAGS = -I m4
> +
>  unstable_protocols = 
> \
>   unstable/pointer-gestures/pointer-gestures-unstable-v1.xml  
> \
>   unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml  
> \
> 

I'm sorry, I didn't specify - this is a patch for wayland-protocols.
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel


[PATCH] Makefile.am: add include dir for AC_CONFIG_MACRO_DIR to work

2018-06-12 Thread Maciej Wolny
da331647269ee9d73c4008ae901d107320bdc8d1 added a compatiblity macro for
old versions of pkg-config. However, the file in which that macro
resides was not included. From the autoconf docs: "Note that if you use
aclocal from Automake to generate aclocal.m4, you must also set
ACLOCAL_AMFLAGS = -I dir in your top-level Makefile.am.".
---
 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 4b9a901..1aa13cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 unstable_protocols =   
\
unstable/pointer-gestures/pointer-gestures-unstable-v1.xml  
\
unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml  
\
-- 
2.11.0

Before this, ./autogen.sh would fail for me (with autoconf 2.68 and
pkgconfig 0.25).

-- milloni
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel