[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

Current version of AM_MISSING_PROG - taking two arguments - was already
available on 1.5 which was released >ten years old. of course in 1.11.3
too. I think you have to re-bootstrap to pick up macros from missing.m4.


On Tue, Feb 5, 2013 at 11:14 AM, Behdad Esfahbod <behdad at behdad.org> wrote:

> Note that AM_MISSING_PROG is very recent addition.  It's not in the
> two-year
> old automake 1.11.3...
>
> On 02/04/2013 03:57 AM, Akira TAGOH wrote:
> >  configure.ac    |    2 ++
> >  src/Makefile.am |    2 +-
> >  2 files changed, 3 insertions(+), 1 deletion(-)
> >
> > New commits:
> > commit da0946721af3ab2dff3cd903065336b93592d067
> > Author: Akira TAGOH <akira at tagoh.org>
> > Date:   Mon Feb 4 17:57:00 2013 +0900
> >
> >     Use AM_MISSING_PROG instead of hardcoding missing
> >
> > diff --git a/configure.ac b/configure.ac
> > index 0a13165..514890c 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -70,6 +70,8 @@ AC_PROG_MAKE_SET
> >  PKG_PROG_PKG_CONFIG
> >  m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir],
> ${libdir}/pkgconfig))
> >
> > +AM_MISSING_PROG([GPERF], [gperf])
> > +
> >  AC_MSG_CHECKING([for RM macro])
> >  _predefined_rm=`make -p -f /dev/null 2>/dev/null|grep '^RM ='|sed -e
> 's/^RM = //'`
> >  if test "x$_predefined_rm" = "x"; then
> > diff --git a/src/Makefile.am b/src/Makefile.am
> > index 3bb90ea..8fb8b64 100644
> > --- a/src/Makefile.am
> > +++ b/src/Makefile.am
> > @@ -116,7 +116,7 @@ fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
> >       mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
> >
> >  fcobjshash.h: fcobjshash.gperf
> > -     $(AM_V_GEN) $(top_srcdir)/missing --run gperf -m 100 $< > $@.tmp
> && \
> > +     $(AM_V_GEN) $(GPERF) -m 100 $< > $@.tmp && \
> >       mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
> >
> >  EXTRA_DIST += \
> > _______________________________________________
> > Fontconfig mailing list
> > Fontconfig at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/fontconfig
> >
>
> --
> behdad
> http://behdad.org/
>



-- 
Akira TAGOH
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/fontconfig/attachments/20130205/e05f3221/attachment.html>