Re: Patch to make Pango use Automake 1.7



Owen Taylor wrote:

On Sun, 2003-03-09 at 06:33, James Henstridge wrote:
I have written a patch to get the HEAD branch of Pango to use Automake 1.7. It is attached to the following bug:
   http://bugzilla.gnome.org/show_bug.cgi?id=107913

OK, I've read through it all and it looked pretty good.
(I wouldn't be surprised if I missed something ... my eyes glazed
over pretty hard when I got to all the modules/*/Makefile.am
changes, but all the changes looked good in principle.)

Cool. It should make it easier to cleanly add or remove modules for a new backend to those makefiles.


The only things I noticed were one typo:

+dnl I would use AC_HELP_STRING here, but due to some bugs in
m4_text_wrap,
+dnl it interprets the commas in incorrectly ...

the "it" here refers to autoconf.  Is that the typo you are pointing out?

And docs/Makefile.am had:

+AUTOMAKE_OPTIONS = 1.6

Which I wasn't sure was intentioal, or supposed to be '1.7' now.

We have an "AUTOMAKE_OPTIONS = 1.7" in the toplevel makefile, which is all that is strictly needed. However, I have been adding the AUTOMAKE_OPTIONS line to the gtk-doc documentation makefiles since it is highly likely that someone will cut and paste those makefiles into another package.

The idea here is to stop people cut and pasting the code and then report bugs when it doesn't work correctly with automake 1.4 (due to the different handling of the "include" statement). I can remove the statement, but I would prefer to leave it in for the above reasons.

We probably need to do a bit of testing of this ... it would be
very easy to get HAVE_X/HAVE_XFT mixed up in some place
or something like that.

What would make sense to me would be to try tow things:

- Try building without Xft (should be easy enough ... just move the Xft.pc file out of the way temporarily)

Just tried this, and it works.  (make + make check).

- Try building with --with-included-modules. (It wouldn't
  be surprising if this is broken for some other reason
  though ... it's reasonably fragile and not tested much.)

This one also seemed to work. Running "nm" on the various libraries showed that the modules had been included in the shared libraries, as expected.

I can try to remember to do this after you check in if you
want.

It also includes a number of makefile cleanups that were made possible because of new features in Automake 1.7.

pango/Makefile.am certainly looks a lot prettier with your changes.
So should I go ahead and check this version of the patch in then?

James.

--
Email: james daa com au
WWW:   http://www.daa.com.au/~james/






[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]