summaryrefslogtreecommitdiff
path: root/driver/xf86-video-vmware/configure.ac
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-08-22 12:19:01 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-08-22 12:19:01 +0000
commit03c00c180c5a4f6a52f30cb5a45d251b750a8051 (patch)
treee53b9d7ab57ac919dfeeb09dba00f78b2d708a71 /driver/xf86-video-vmware/configure.ac
parentaba7a11777b8ee2135021a56d7dc33c9d1499be1 (diff)
Update to xf86-video-vmware 11.0.2. No functionnal change.
Diffstat (limited to 'driver/xf86-video-vmware/configure.ac')
-rw-r--r--driver/xf86-video-vmware/configure.ac44
1 files changed, 22 insertions, 22 deletions
diff --git a/driver/xf86-video-vmware/configure.ac b/driver/xf86-video-vmware/configure.ac
index 5b696b572..f88d3764b 100644
--- a/driver/xf86-video-vmware/configure.ac
+++ b/driver/xf86-video-vmware/configure.ac
@@ -20,47 +20,50 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+# Initialize Autoconf
+AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- 11.0.1,
+ [11.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-vmware)
-
+ [xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# 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.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [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.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
+
+# Checks for programs.
+AM_PROG_CC_C_O
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
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"])
-# 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(DPMSExtension, xextproto)
XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(DRM, [libdrm])
@@ -80,11 +83,8 @@ PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
[Has version 1.7.0 or greater of the Xserver])])
-
# Checks for libraries.
-# Checks for header files.
-AC_HEADER_STDC
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
@@ -98,14 +98,14 @@ fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=vmware
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT