diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-04 17:10:02 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-04 17:10:02 +0000 |
| commit | 3ca201b3f1d8839b399b35945b1d2f3063636b25 (patch) | |
| tree | b4a651a3f90a4a5e3f3646cd7a218e312b3d4eb4 /share/mk | |
| parent | 854c2a33adda6e7f8dee3e9f4ef5fb7931e5ea04 (diff) | |
Switch to automake 1.12/autoconf 2.68.
Note that I don't plan to regenerate all the autotools files now.
It's a lazy update that will only take effect when autotools files
are re-generated, upon updates or for another reason.
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.xorg.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk index fb997d9c0..e14d219d2 100644 --- a/share/mk/bsd.xorg.mk +++ b/share/mk/bsd.xorg.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xorg.mk,v 1.41 2012/03/11 10:08:59 matthieu Exp $ -*- makefile -*- +# $OpenBSD: bsd.xorg.mk,v 1.42 2012/08/04 17:10:01 matthieu Exp $ -*- makefile -*- # # Copyright © 2006,2012 Matthieu Herrb # @@ -19,8 +19,8 @@ .include "${.CURDIR}/../Makefile.inc" .endif -AUTOMAKE_VERSION= 1.9 -AUTOCONF_VERSION= 2.62 +AUTOMAKE_VERSION= 1.12 +AUTOCONF_VERSION= 2.68 PYTHON_VERSION= 2.7 # Where source lives @@ -59,6 +59,8 @@ CONFIGURE_ENV= PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \ CFLAGS="$(CFLAGS:C/ *$//)" \ MAKE="${MAKE}" +CONFIGURE_ARGS+= --disable-silent-rules + AUTOTOOLS_ENV= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \ AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \ ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \ |