xf86-video-intel: 10 commits - configure.ac man/Makefile.am
Gaetan Nadon
gnadon at kemper.freedesktop.org
Thu Jul 22 12:25:45 PDT 2010
configure.ac | 67 ++++++++++++++++++++++++++------------------------------
man/Makefile.am | 17 +-------------
2 files changed, 34 insertions(+), 50 deletions(-)
New commits:
commit 0ae30b6d1f4f6c2f2db9443f1027ea41849ad087
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index f7b5e7a..c62af8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-intel],
[2.12.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(.)
+# Initialize Automake
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
@@ -40,7 +40,7 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
@@ -48,9 +48,9 @@ AM_PROG_CC_C_O
PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no])
AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
-
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
@@ -72,13 +72,13 @@ AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only],
[KMS_ONLY="$enableval"],
[KMS_ONLY=no])
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.21])
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
@@ -134,7 +134,6 @@ if test "$KMS_ONLY" = yes; then
AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
fi
-
DRIVER_NAME=intel
AC_SUBST([DRIVER_NAME])
AC_SUBST([moduledir])
commit b12b2219677d94933774955b50545efceff57279
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diff --git a/configure.ac b/configure.ac
index ee7edba..f7b5e7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,17 +139,18 @@ DRIVER_NAME=intel
AC_SUBST([DRIVER_NAME])
AC_SUBST([moduledir])
-AC_OUTPUT([
- Makefile
- uxa/Makefile
- src/Makefile
- src/xvmc/Makefile
- src/xvmc/shader/Makefile
- src/xvmc/shader/mc/Makefile
- src/xvmc/shader/vld/Makefile
- src/legacy/Makefile
- src/legacy/i810/Makefile
- src/legacy/i810/xvmc/Makefile
- man/Makefile
- src/render_program/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ uxa/Makefile
+ src/Makefile
+ src/xvmc/Makefile
+ src/xvmc/shader/Makefile
+ src/xvmc/shader/mc/Makefile
+ src/xvmc/shader/vld/Makefile
+ src/legacy/Makefile
+ src/legacy/i810/Makefile
+ src/legacy/i810/xvmc/Makefile
+ man/Makefile
+ src/render_program/Makefile
])
+AC_OUTPUT
commit 8b2d65da41461735b1138fdd6e0efc96419cd815
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Jul 21 14:37:41 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diff --git a/configure.ac b/configure.ac
index fe3c800..ee7edba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,22 +52,22 @@ AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[Disable DRI support [[default=auto]]]),
[DRI="$enableval"],
[DRI=auto])
-AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
+AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
[Disable XvMC support [[default=yes]]]),
[XVMC="$enableval"],
[XVMC=yes])
-AC_ARG_ENABLE(kms-only, AC_HELP_STRING([--enable-kms-only],
+AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only],
[Assume KMS support [[default=no]]]),
[KMS_ONLY="$enableval"],
[KMS_ONLY=no])
commit 3feeef5294b1a2df05a25f4f4eb6400be6cc4ee1
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Jul 21 14:05:22 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diff --git a/configure.ac b/configure.ac
index bfe5f60..fe3c800 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-intel],
[xf86-video-intel])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 74a828e286c46473b8edf6de32c1989c052dd82c
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diff --git a/configure.ac b/configure.ac
index ae91afa..bfe5f60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-intel],
- 2.12.0,
+ [2.12.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-intel)
+ [xf86-video-intel])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit 33ec66d7006e2a7e287fd77c53a31db49220591a
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Jul 20 21:54:11 2010 -0400
config: remove unrequired AC_SUBST([DRI_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diff --git a/configure.ac b/configure.ac
index f9ab854..ae91afa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,6 @@ if test "$KMS_ONLY" = yes; then
AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
fi
-AC_SUBST([DRI_CFLAGS])
DRIVER_NAME=intel
AC_SUBST([DRIVER_NAME])
commit b20b8ac937505310fbe68f07e42cafe4ba88da76
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diff --git a/configure.ac b/configure.ac
index 410ff0b..f9ab854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,6 @@ AM_PROG_CC_C_O
PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no])
AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
-AC_HEADER_STDC
AH_TOP([#include "xorg-server.h"])
commit 9fe5169fffeee10b1262f160a15c11c283e2faa7
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Jul 20 19:41:31 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diff --git a/configure.ac b/configure.ac
index 26070c1..410ff0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AM_PROG_CC_C_O
PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no])
commit e6b8811e5bb30e2cd4e35b1fe84d69f18a73ee0e
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Jul 20 18:45:19 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9090540..26070c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-intel],
2.12.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit 2d85efaa36791bd441f069b612ee86387353d1ed
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Jul 20 16:15:29 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
diff --git a/configure.ac b/configure.ac
index ad0a46b..9090540 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index 7b687e4..9ca5ff6 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -28,23 +28,10 @@ EXTRA_DIST = $(DRIVER_NAME).man
CLEANFILES = $(driverman_DATA)
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
More information about the xorg-commit
mailing list