[libXext] add ACLOCAL_AMFLAGS = -I m4 to make aclocal pick ax_gcc_builtin.m4

Submitted by Matthieu Herrb on March 17, 2019, 1:29 p.m.

Details

Message ID 20190317132913.51219-1-matthieu@herrb.eu
State Accepted
Commit 47904063048fa6ef6e8e16219ddef4d14d5d9a4b
Headers show
Series "add ACLOCAL_AMFLAGS = -I m4 to make aclocal pick ax_gcc_builtin.m4" ( rev: 1 ) in X.org

Not browsing as part of any series.

Commit Message

Matthieu Herrb March 17, 2019, 1:29 p.m.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
---
 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/Makefile.am b/Makefile.am
index b76bc6c..4f5c67d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@ 
 SUBDIRS = man src specs
 
+ACLOCAL_AMFLAGS = -I m4
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xext.pc
 

Comments

On 3/17/19 6:29 AM, Matthieu Herrb wrote:
> Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
> ---
>   Makefile.am | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/Makefile.am b/Makefile.am
> index b76bc6c..4f5c67d 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,5 +1,7 @@
>   SUBDIRS = man src specs
>   
> +ACLOCAL_AMFLAGS = -I m4
> +
>   pkgconfigdir = $(libdir)/pkgconfig
>   pkgconfig_DATA = xext.pc
>   
> 

Hmm, the build worked fine for me here - what does this fix that I missed?

On 3/17/19 10:33 AM, Matthieu Herrb wrote:
> On Sun, Mar 17, 2019 at 09:07:00AM -0700, Alan Coopersmith wrote:
>> On 3/17/19 6:29 AM, Matthieu Herrb wrote:
>>> Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
>>> ---
>>>    Makefile.am | 2 ++
>>>    1 file changed, 2 insertions(+)
>>>
>>> diff --git a/Makefile.am b/Makefile.am
>>> index b76bc6c..4f5c67d 100644
>>> --- a/Makefile.am
>>> +++ b/Makefile.am
>>> @@ -1,5 +1,7 @@
>>>    SUBDIRS = man src specs
>>> +ACLOCAL_AMFLAGS = -I m4
>>> +
>>>    pkgconfigdir = $(libdir)/pkgconfig
>>>    pkgconfig_DATA = xext.pc
>>>
>>
>> Hmm, the build worked fine for me here - what does this fix that I
>> missed?
> 
> On OpenBSD, using automake 1.12 and autoconf 2.69, autoconf doesn't
> find ax_gcc_builtin.m4 and configure ends eup with a stray
> 
> AX_GCC_BUILTIN([__builtin_popcountl])
> 
> line, causing a syntax error.
> 
> All other X.Org modules that provide ax_*.m4 files in m4, have the
> "ACLOCAL_AMFLAGS = -I m4" line in Makefile.am.
> (And autoreconf suggests to add it when missing)

Huh, I guess either automake 1.15 or my build scripts hid that from me.

In that case, apologies and:

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>