r23565 - gnucash/trunk - Fix ax_pkg_swig.m4 filename.
jralls at ceridwen.us
Mon Dec 16 12:46:30 EST 2013
On Dec 16, 2013, at 8:51 AM, Geert Janssens <janssens-geert at telenet.be> wrote:
> On Sunday 15 December 2013 12:19:51 John Ralls wrote:
>> Author: jralls
>> Date: 2013-12-15 12:19:51 -0500 (Sun, 15 Dec 2013)
>> New Revision: 23565
>> Trac: http://svn.gnucash.org/trac/changeset/23565
>> Fix ax_pkg_swig.m4 filename.
>> Modified: gnucash/trunk/Makefile.am
>> --- gnucash/trunk/Makefile.am 2013-12-15 17:19:40 UTC (rev 23564)
>> +++ gnucash/trunk/Makefile.am 2013-12-15 17:19:51 UTC (rev 23565)
>> @@ -44,7 +44,7 @@
>> macros/as-scrub-include.m4 \
>> macros/binreloc.m4 \
>> macros/compiler-flags.m4 \
>> - macros/ac_pkg_swig.m4 \
>> + macros/ax_pkg_swig.m4 \
>> macros/legacy_macros.m4 \
>> po/gnucash.pot \
>> po/POTFILES.in \
> John, I wasn't aware that the m4 files in macros were distributed. Why is that ?
> The distribution should contain a generated configure script, right ?
> If they should be distributed, we should also add two other m4 files I copied from the autoconf
> Both are needed for the python bindings. Before I included ax_pkg_swig.m4 the python macros
> were in ac_prog_swig.m4. But that file was outdated, so I replaced it with ax_pkg_swig.m4 as
> recommended by the swig manual.
> This brings me to another m4 related question I have wanted to ask for some time - autogen.sh
> produces this warning:
> libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
> libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
> Should that be 'AC_CONFIG_MACRO_DIR([macros])' in our case, or is m4 intended for a different
> purpose ?
Well, that explains why you didn’t update Makefile.am. ;-)
If we need to add a macro to our tree in order to autogen we should include it in the dist so that others can autogen or autoreconf configure; that’s sometimes needed to deal with libtool version conflicts. If that macro is installed into somewhere on aclocal’s path then we don’t need to distribute it ourselves.
Yes, if we’re going to mollify libtoolize we should tell it macros rather than m4; that seems to be where it’s putting its macro files anyway and if we tell it m4 then we have to provide an m4 in the dist.
More information about the gnucash-devel