On Sat, Feb 18, 2012 at 02:33:34PM -0500, Gaetan Nadon wrote: > This reverts commit 9184af921bc2f332fcb6c9b47001414378eab8e2. > > All X.Org modules must be able to be configured with autoconf 2.60. > In addition, version 2.63 has GPL licensing issues which prevents > some vendor to release software based on it. > > The AM_SILENT_RULES are already handled by XORG_DEFAULT_OPTIONS. > > All X.Org modules must be able to be configured with libtool 1.5. > > AM_MAINTAINER_MODE default value is "enabled" already. > > We use the same autogen script for all x.org modules. > There are proposals for changes which should be reviewed and eventually > applied to all modules together. > > The lt*.m4 patterns are already included in the root .gitignore file. > This can be proposed as a change to all modules, but it invloves > changing the topvel .gitignore, the m4/.gitignore, the ACLOCAL_AMFLAGS > and the AC_CONFIG_MACRO_DIR together. > > For more information on project wide configuration guidelines, > consult http://www.x.org/wiki/ModularDevelopersGuide > and http://www.x.org/wiki/NewModuleGuidelines. > > Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
Although I didn't notice the changes since OpenBSD can't use the based versions of the intel driver, I fully support this. Acked-by: Matthieu Herrb <matthieu.he...@laas.fr> > --- > Makefile.am | 1 - > autogen.sh | 14 ++++++++++---- > configure.ac | 18 ++++++------------ > m4/.gitignore | 5 ----- > 4 files changed, 16 insertions(+), 22 deletions(-) > delete mode 100644 m4/.gitignore > > diff --git a/Makefile.am b/Makefile.am > index 48c3477..b3d37b2 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -18,7 +18,6 @@ > # 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 = man > > diff --git a/autogen.sh b/autogen.sh > index 30d679f..904cd67 100755 > --- a/autogen.sh > +++ b/autogen.sh > @@ -1,6 +1,12 @@ > #! /bin/sh > > -test -n "$srcdir" || srcdir=`dirname "$0"` > -test -n "$srcdir" || srcdir=. > -autoreconf --force --install --verbose "$srcdir" > -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" > +srcdir=`dirname $0` > +test -z "$srcdir" && srcdir=. > + > +ORIGDIR=`pwd` > +cd $srcdir > + > +autoreconf -v --install || exit 1 > +cd $ORIGDIR || exit $? > + > +$srcdir/configure --enable-maintainer-mode "$@" > diff --git a/configure.ac b/configure.ac > index 785392a..bee0885 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -21,24 +21,18 @@ > # Process this file with autoconf to produce a configure script > > # Initialize Autoconf > -AC_PREREQ([2.63]) > +AC_PREREQ([2.60]) > AC_INIT([xf86-video-intel], > [2.17.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([build-aux]) > -AC_CONFIG_MACRO_DIR([m4]) > +AC_CONFIG_AUX_DIR(.) > > # Initialize Automake > -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])]) > +AM_INIT_AUTOMAKE([foreign dist-bzip2]) > +AM_MAINTAINER_MODE > > # Require X.Org macros 1.8 or later for MAN_SUBSTS set by > XORG_MANPAGE_SECTIONS > m4_ifndef([XORG_MACROS_VERSION], > @@ -56,8 +50,8 @@ m4_ifndef([XORG_DRIVER_CHECK_EXT], > depending on your distribution, try package 'xserver-xorg-dev' or > 'xorg-x11-server-devel'])]) > > # Initialize libtool > -LT_PREREQ([2.2]) > -LT_INIT([disable-static]) > +AC_DISABLE_STATIC > +AC_PROG_LIBTOOL > > # Are we in a git checkout? > dot_git=no > diff --git a/m4/.gitignore b/m4/.gitignore > deleted file mode 100644 > index 464ba5c..0000000 > --- a/m4/.gitignore > +++ /dev/null > @@ -1,5 +0,0 @@ > -libtool.m4 > -lt~obsolete.m4 > -ltoptions.m4 > -ltsugar.m4 > -ltversion.m4 > -- > 1.7.5.4 > > _______________________________________________ > xorg-devel@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel -- Matthieu Herrb _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel