Sync with recent X.Org template

This commit is contained in:
matthieu
2014-07-13 14:25:20 +00:00
parent 15915e192f
commit e911b372ff

View File

@@ -28,13 +28,7 @@ AC_INIT([xf86-video-wsfb],
[xf86-video-wsfb])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# 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
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(.)
# Initialize Automake
@@ -45,6 +39,12 @@ AM_MAINTAINER_MODE
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
# Initialize 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
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
@@ -64,21 +64,18 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
# Checks for libraries.
# Check for xf1bpp & xf4bpp (removed in xorg-server 1.6 & later)
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
AC_SUBST([moduledir])
DRIVER_NAME=wsfb
AC_SUBST([DRIVER_NAME])
AC_SUBST([moduledir])
AC_CONFIG_FILES([
Makefile
src/Makefile
man/Makefile
Makefile
src/Makefile
man/Makefile
])
AC_OUTPUT