mirror of
https://github.com/X11Libre/xf86-video-geode.git
synced 2026-03-24 01:24:52 +00:00
config: fix Autoconf warnings and improve comments
These changes have been done in all other video drivers. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
This commit is contained in:
committed by
Martin-Éric Racine
parent
725d6ddc0b
commit
8fc372b4e2
33
configure.ac
33
configure.ac
@@ -20,6 +20,7 @@
|
||||
#
|
||||
# Process this file with autoconf to produce a configure script
|
||||
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT([xf86-video-geode],
|
||||
[2.11.12],
|
||||
@@ -28,34 +29,43 @@ AC_INIT([xf86-video-geode],
|
||||
[http://www.x.org/wiki/GeodeDriver])
|
||||
|
||||
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
|
||||
|
||||
# Initialize libtool
|
||||
AC_DISABLE_STATIC
|
||||
AC_PROG_LIBTOOL
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.4)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Checks for programs.
|
||||
AC_DISABLE_STATIC
|
||||
AC_PROG_LIBTOOL
|
||||
|
||||
AH_TOP([#include "xorg-server.h"])
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Configuration options
|
||||
# -----------------------------------------------------------------------------
|
||||
# Define a configure option for an alternate input 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"])
|
||||
AC_SUBST([moduledir])
|
||||
|
||||
# Define a configure option to enable/disable lcd panel support
|
||||
AC_ARG_ENABLE(geodegx-panel,
|
||||
AC_HELP_STRING([--disable-geodegx-panel],
|
||||
AS_HELP_STRING([--disable-geodegx-panel],
|
||||
[Disable support for flatpanels with the Geode GX]),
|
||||
[ ],
|
||||
[ PANEL_CPPFLAGS=-DPNL_SUP ])
|
||||
@@ -106,19 +116,19 @@ main ()
|
||||
esac
|
||||
AC_SUBST([M32_CFLAGS])
|
||||
|
||||
# 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(XV, videoproto)
|
||||
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
|
||||
|
||||
# Checks for pkg-config packages
|
||||
# Obtain compiler/linker options for the Geode driver dependencies
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
|
||||
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
|
||||
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
|
||||
HAVE_XEXTPROTO_71="no")
|
||||
|
||||
# Checks for libraries.
|
||||
# Checks for libpciaccess support.
|
||||
SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
|
||||
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
|
||||
@@ -131,7 +141,8 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
|
||||
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
|
||||
fi
|
||||
|
||||
AC_OUTPUT([
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
src/Makefile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
Reference in New Issue
Block a user