From 068bc21a03d7fa7e5de74b8e318b5c5d3d96c02f Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 19 Aug 2009 02:33:18 -0700 Subject: [PATCH] Updated to reflect package --- configure.ac | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index fda3388..cd8270f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,12 @@ -dnl Copyright 2007 Peter Hutterer -dnl Process this file with autoconf to create configure. +# Based off xorg configure.ac packages (xinput and evdev) +# Modified by Ryan Huffman + +# Copyright 2007 Peter Hutterer +# Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(tmd,[1.4.99.1], [],tmd) +AC_INIT(tmd,[0.1.0], [],tmd) + AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -16,37 +20,20 @@ AC_PROG_LIBTOOL AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS - -# Checks for extensions -XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) - -# Checks for pkg-config packages PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) AC_SUBST(XORG_CFLAGS) AC_SUBST(XORG_LIBS) -# Checks for pkg-config packages -PKG_CHECK_MODULES(TMD, x11 xext [xi >= 1.2] [inputproto >= 1.5]) - # XI2 support -PKG_CHECK_MODULES(XI2, [xi >= 1.2.99] [inputproto >= 1.9.99.12], - HAVE_XI2="yes"; AC_DEFINE(HAVE_XI2, 1, [XI2 available]), - HAVE_XI2="no"); -AM_CONDITIONAL(HAVE_XI2, [ test "$HAVE_XI2" = "yes" ]) - -AC_SUBST(TMD_CFLAGS) -AC_SUBST(TMD_LIBS) -AC_SUBST(HAVE_XI2) +PKG_CHECK_MODULES(XI2, [xi >= 1.2.99] [inputproto >= 1.9.99.12]) AC_SUBST(VERSION) -CFLAGS="$CFLAGS $XORG_CFLAGS $TMD_CFLAGS" -LIBS="$LIBS $XORG_LIBS $TMD_LIBS" +CFLAGS="$CFLAGS $XORG_CFLAGS $XI2_CFLAGS" +LIBS="$LIBS $XORG_LIBS $XI2_LIBS" XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile - src/Makefile]) + src/Makefile]) -- 2.11.4.GIT