Date: Tue, 17 Feb 2015 10:30:56 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379150 - head/Mk/Uses Message-ID: <201502171030.t1HAUuSU031633@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Feb 17 10:30:55 2015 New Revision: 379150 URL: https://svnweb.freebsd.org/changeset/ports/379150 QAT: https://qat.redports.org/buildarchive/r379150/ Log: Run intltoolize before running autoreconf when a port uses intltool and configure.ac (or configure.in) contains '^(AC|IT)_PROG_INTLTOOL'. Intltoolize updates intltool related build scripts and m4 files that are used by autoreconf to generate configure. This change guarantees that the build scripts, configure and LOCALBASE/bin/intltool-* are all in sync. PR: 194393 Differential Revision: https://reviews.freebsd.org/D976 Submitted by: olivierd, kwm (modified) Exp-run by: antoine Approved by: portmgr (antoine) Modified: head/Mk/Uses/autoreconf.mk Modified: head/Mk/Uses/autoreconf.mk ============================================================================== --- head/Mk/Uses/autoreconf.mk Tue Feb 17 10:05:13 2015 (r379149) +++ head/Mk/Uses/autoreconf.mk Tue Feb 17 10:30:55 2015 (r379150) @@ -75,6 +75,13 @@ do-autoreconf: # Don't modify time stamps if the files already exist @test -e ${CONFIGURE_WRKSRC}/${f} || ${TOUCH} ${CONFIGURE_WRKSRC}/${f} .endfor +.if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool} + @(cd ${CONFIGURE_WRKSRC} && \ + if test -f configure.ac; then configure=configure.ac; \ + else configure=configure.in; fi && \ + if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \ + then ${LOCALBASE}/bin/intltoolize -f -c; fi) +.endif @(cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i) .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502171030.t1HAUuSU031633>