From 7c277ee54e7d0ea0c44b304897049a01e2d1a44a Mon Sep 17 00:00:00 2001 From: "Stephen M. Webb" Date: Tue, 13 Jul 2010 10:45:36 +0200 Subject: Configure fixes Adds the mtdev package dependency and fix some smaller issues. Signed-off-by: Stephen M. Webb Signed-off-by: Henrik Rydberg --- autogen.sh | 1 - configure.ac | 7 ++----- src/Makefile.am | 6 ++++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/autogen.sh b/autogen.sh index 904cd67..a08311b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,3 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac index 5d63a3f..52f16eb 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,7 @@ AC_INIT([Gesture Recognition And Instantiation Library], [grail]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_AUX_DIR([config-aux]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -21,11 +22,7 @@ AC_PROG_LIBTOOL AC_PROG_CC AC_PROG_INSTALL -# Initialize X.Org macros -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.5) -XORG_DEFAULT_OPTIONS +PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.0]) AC_CONFIG_FILES([Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 69ff759..0ecc531 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ lib_LTLIBRARIES = libgrail.la -libgrail_la_LDFLAGS = -version-info @LIB_VERSION@ +libgrail_la_LDFLAGS = \ + -version-info @LIB_VERSION@ \ + $(MTDEV_LIBS) libgrail_la_SOURCES = \ touch-dev.c \ @@ -8,7 +10,7 @@ libgrail_la_SOURCES = \ gesture-client.c \ gesture-dev.c -AM_CFLAGS = $(CWARNFLAGS) +AM_CFLAGS = $(CWARNFLAGS) -std=c99 INCLUDES = -I$(top_srcdir)/include/ -- cgit v1.2.3