[PATCH] xf86-video-intel: Update autotools configuration

[PATCH] xf86-video-intel: Update autotools configuration

[Javier Jardón]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

Hello,

here another patch to update the autotools configuration of the
xf86-video-intel package

It uses the new libtool syntax and the new silent build mode.

Regards

-- 
Javier Jardón Cabezas

[-- Attachment #2: 0001-Update-autotools-configuration.patch --]
[-- Type: application/octet-stream, Size: 3057 bytes --]

From 5ba3665f42413456b08fc8824016581a247ccc09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 9 Feb 2011 00:36:37 +0000
Subject: [PATCH] Update autotools configuration

Use new libtool syntax and silent-rules to silent
the build output a bit (linux-like)
---
 Makefile.am   |    1 +
 autogen.sh    |   14 ++++----------
 configure.ac  |   18 ++++++++++++------
 m4/.gitignore |    5 +++++
 4 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 m4/.gitignore

diff --git a/Makefile.am b/Makefile.am
index f4239de..83948ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = uxa src man
 MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/autogen.sh b/autogen.sh
index 904cd67..30d679f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,6 @@
 #! /bin/sh
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+autoreconf --force --install --verbose "$srcdir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index 13a801a..5a1baac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,18 +21,24 @@
 # Process this file with autoconf to produce a configure script
 
 # Initialize Autoconf
-AC_PREREQ([2.60])
+AC_PREREQ([2.63])
 AC_INIT([xf86-video-intel],
         [2.14.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_AUX_DIR(.)
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
+AM_MAINTAINER_MODE([enable])
+
+# Support silent build rules, requires at least automake-1.11. Disable
+# by either passing --disable-silent-rules to configure or passing V=1
+# to make
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
@@ -50,8 +56,8 @@ m4_ifndef([XORG_DRIVER_CHECK_EXT],
   depending on your distribution, try package 'xserver-xorg-dev' or 'xorg-x11-server-devel'])])
 
 # Initialize libtool
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
 
 PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.1], [gen4asm=yes], [gen4asm=no])
 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..464ba5c
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,5 @@
+libtool.m4
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
-- 
1.7.4


[-- Attachment #3: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] xf86-video-intel: Update autotools configuration

[Chris Wilson]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

On Wed, 9 Feb 2011 11:30:50 +0000, Javier Jardón <jjardon@gnome.org> wrote:
> Hello,
> 
> here another patch to update the autotools configuration of the
> xf86-video-intel package
> 
> It uses the new libtool syntax and the new silent build mode.

Applied, thanks!
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] xf86-video-intel: Update autotools configuration

[Julien Cristau]

On Wed, Feb  9, 2011 at 11:30:50 +0000, Javier Jardón wrote:

> Hello,
> 
> here another patch to update the autotools configuration of the
> xf86-video-intel package
> 
> It uses the new libtool syntax and the new silent build mode.
> 
XORG_DEFAULT_OPTIONS already enables the silent mode, iirc.

Cheers,
Julien

Re: [PATCH] xf86-video-intel: Update autotools configuration

[Chris Wilson]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

On Wed, 9 Feb 2011 12:58:10 +0100, Julien Cristau <jcristau@debian.org> wrote:
> On Wed, Feb  9, 2011 at 11:30:50 +0000, Javier Jardón wrote:
> 
> > Hello,
> > 
> > here another patch to update the autotools configuration of the
> > xf86-video-intel package
> > 
> > It uses the new libtool syntax and the new silent build mode.
> > 
> XORG_DEFAULT_OPTIONS already enables the silent mode, iirc.

True, that part is a no-op but I'm all in favour of tidying up my build
dir. :)
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] xf86-video-intel: Update autotools configuration

[Cyril Brulebois]

[-- Attachment #1.1: Type: text/plain, Size: 587 bytes --]

Hi Javier.

Javier Jardón <jjardon@gnome.org> (09/02/2011):
> here another patch to update the autotools configuration of the
> xf86-video-intel package
> 
> It uses the new libtool syntax and the new silent build mode.

The commit message says:
| Update autotools configuration
| 
| Use new libtool syntax and silent-rules to silent
| the build output a bit (linux-like)

What it doesn't say is:
-AC_CONFIG_AUX_DIR(.)
+AC_CONFIG_AUX_DIR([build-aux])

This broke tinderbox builds: http://tinderbox.x.org/

(Cleaning and configuring again seems to fix it.)

KiBi.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] xf86-video-intel: Update autotools configuration

[Javier Jardón]

2011/2/10 Cyril Brulebois <kibi@debian.org>:
> Hi Javier.

Hey,

> The commit message says:
> | Update autotools configuration
> |
> | Use new libtool syntax and silent-rules to silent
> | the build output a bit (linux-like)
>
> What it doesn't say is:
> -AC_CONFIG_AUX_DIR(.)
> +AC_CONFIG_AUX_DIR([build-aux])
>
> This broke tinderbox builds: http://tinderbox.x.org/
>
> (Cleaning and configuring again seems to fix it.)

Ops, sorry. I'll try to be more specific next time

Regards,
-- 
Javier Jardón Cabezas
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] xf86-video-intel: Update autotools configuration

[Cyril Brulebois]

[-- Attachment #1.1: Type: text/plain, Size: 1115 bytes --]

Hi again,

Cyril Brulebois <kibi@debian.org> (10/02/2011):
> The commit message says:
> | Update autotools configuration
> | 
> | Use new libtool syntax and silent-rules to silent
> | the build output a bit (linux-like)
> 
> What it doesn't say is:
> -AC_CONFIG_AUX_DIR(.)
> +AC_CONFIG_AUX_DIR([build-aux])

sorry to get back to this, but it's actually a bit more annoying than
just breaking tinderbox at the time. Out of the 56 X drivers I'm
currently maintaining, that's the only one no longer searching in '.',
and I don't know why that should be.

Also, “autoreconf -vfi” puts files there, but those aren't cleaned,
even through targets like distclean or maintainer-clean. Having to
clean things through “git clean -xdf” sounds like a no-no to me. (Of
course, our build system is flexible enough that I can do anything,
like rm -rf'ing that directory, but I'd rather not have to come to
this kind of things…)

Can we get that part of this commit reverted please, at least for
consistency with other drivers? Or is it actually serving a real,
undocumented purpose?

KiBi.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] xf86-video-intel: Update autotools configuration

[Chris Wilson]

[-- Attachment #1: Type: text/plain, Size: 1331 bytes --]

On Wed, 30 Mar 2011 03:43:29 +0200, Cyril Brulebois <kibi@debian.org> wrote:
> Hi again,
> 
> Cyril Brulebois <kibi@debian.org> (10/02/2011):
> > The commit message says:
> > | Update autotools configuration
> > | 
> > | Use new libtool syntax and silent-rules to silent
> > | the build output a bit (linux-like)
> > 
> > What it doesn't say is:
> > -AC_CONFIG_AUX_DIR(.)
> > +AC_CONFIG_AUX_DIR([build-aux])
> 
> sorry to get back to this, but it's actually a bit more annoying than
> just breaking tinderbox at the time. Out of the 56 X drivers I'm
> currently maintaining, that's the only one no longer searching in '.',
> and I don't know why that should be.
> 
> Also, “autoreconf -vfi” puts files there, but those aren't cleaned,
> even through targets like distclean or maintainer-clean. Having to
> clean things through “git clean -xdf” sounds like a no-no to me. (Of
> course, our build system is flexible enough that I can do anything,
> like rm -rf'ing that directory, but I'd rather not have to come to
> this kind of things…)

I am slightly perplexed by this, since the darn thing passed make
distcheck which I thought included a test to make sure that all files
were deleted after a make clean. Was I just naive in believing that was
sufficient?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx