qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to idioms used in modern X.Org input drivers.

Browse Source
This commit is contained in:
matthieu 2009-11-22 22:18:12 +00:00
parent deae15d61d
commit 68823f5b52
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
driver/xf86-input-usbtablet/configure.ac
View File

@ -28,13 +28,19 @@ AC_INIT([xf86-input-usbtablet],
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.) AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
DRIVER_NAME=usbtablet DRIVER_NAME=usbtablet
AC_SUBST([DRIVER_NAME]) AC_SUBST([DRIVER_NAME])
# 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)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
# Checks for programs. # Checks for programs.
@ -44,7 +50,6 @@ AC_PROG_CC
AH_TOP([#include "xorg-server.h"]) AH_TOP([#include "xorg-server.h"])
#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
# #
AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput], AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
[Build XInput support (default: yes)]), [Build XInput support (default: yes)]),
@ -53,14 +58,6 @@ AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
if test "x$XINPUT" = "xyes" ; then if test "x$XINPUT" = "xyes" ; then
AC_DEFINE(XINPUT,1,[Enable XInput support]) AC_DEFINE(XINPUT,1,[Enable XInput support])
fi fi
#
#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
# [Build XKB support (default: yes)]),
# [XKB=$enableval],[XKB=yes])
#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
#if test "x$XKB" = "xyes" ; then
# AC_DEFINE(XKB,1,[Enable XKB support])
#fi
AC_ARG_WITH(xorg-module-dir, AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR], AC_HELP_STRING([--with-xorg-module-dir=DIR],
@ -75,18 +72,16 @@ AC_SUBST(inputdir)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages # Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server) XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
AC_ARG_WITH([sdkdir], [],
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' [sdkdir="$withval"],
AC_SUBST([CFLAGS]) [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`])
AC_SUBST([sdkdir])
# Checks for libraries. # Checks for libraries.
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile src/Makefile man/Makefile]) AC_OUTPUT([Makefile src/Makefile man/Makefile])