Re: AM_CONDITIONAL fails with line break at the end of $2
Eric Blake <[email protected]>
| Newsgroups | gmane.comp.sysutils.automake.patches |
|---|---|
| Organization | Red Hat, Inc. |
| Message-ID | <[email protected]> |
dropping autoconf
On 07/17/2014 10:24 AM, Eric Blake wrote:
> [adding automake]
>
> On 07/17/2014 10:00 AM, Dimitrios Apostolou wrote:
>
>> --- cond.m4 2014-07-17 17:46:37.741723897 +0200
>> +++ cond.2.m4 2014-07-17 17:50:43.456076469 +0200
>> @@ -13,17 +13,18 @@
>> [AC_PREREQ([2.52])dnl
>> m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
>> [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
>> AC_SUBST([$1_TRUE])dnl
>> AC_SUBST([$1_FALSE])dnl
>> _AM_SUBST_NOTMAKE([$1_TRUE])dnl
>> _AM_SUBST_NOTMAKE([$1_FALSE])dnl
>> m4_define([_AM_COND_VALUE_$1], [$2])dnl
>> -if $2; then
>> +if $2
>> +then
>> $1_TRUE=
>> $1_FALSE='#'
>> else
>> $1_TRUE='#'
>> $1_FALSE=
>> fi
>> AC_CONFIG_COMMANDS_PRE(
>> [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
>
This patch looks correct for automake, especially given that I just
pushed a similar patch to autoconf's AS_IF. Alas, I don't trust myself
to push it to all the correct automake branches, so I'm hoping a
maintainer will step in here.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
(application/pgp-signature, 604 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTyETaAAoJEKeha0olJ0NqX/wIAIZ3KemzOX5wnvuQM1WviEWF 9OGgE4C+7jm21B915YTlhbS9FGOtC5clnYe6QFHQ93qc2Z1YzMpO2Bjs204N8qU3 1Il+fZS2raMTlTJFM62agKL1RK+JR6hrkLXPA3uI7STFbZq4Y93/Jo+FsauId4P7 PbRJzqJEDMrg3yI8YD0plhVc4X+LULgtWXEpRWMTR031OrBfhzDubT25fQ7fgcGn YE4yv1GgpYCgsOCB/qv4UK4Om3UZHFOM3tc6VVHTjlzq2DmkNg7EhCLcdqNYAFGi sMFC/01GD/XEu6tz/sUcnAnTUNTdGGJPz/wheGT2fupwz+yShiICdIvscZgRTCg= =wTfF -----END PGP SIGNATURE-----