diff options
| author | Stephen M. Webb <stephen.webb@bregmasoft.ca> | 2010-07-13 10:45:36 +0200 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2010-08-05 22:48:37 +0200 |
| commit | 7c277ee54e7d0ea0c44b304897049a01e2d1a44a (patch) | |
| tree | cfa346fa72bb0b29e0a613efff7d097cd09a3c87 /configure.ac | |
| parent | 3b837806891de6cf77d4d74d04567e7e68c82fc0 (diff) | |
Configure fixes
Adds the mtdev package dependency and fix some smaller issues.
Signed-off-by: Stephen M. Webb <stephen.webb@bregmasoft.ca>
Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 2 insertions, 5 deletions
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], | |||
| 6 | [grail]) | 6 | [grail]) |
| 7 | AC_CONFIG_SRCDIR([Makefile.am]) | 7 | AC_CONFIG_SRCDIR([Makefile.am]) |
| 8 | AC_CONFIG_HEADERS([config.h]) | 8 | AC_CONFIG_HEADERS([config.h]) |
| 9 | AC_CONFIG_AUX_DIR([config-aux]) | ||
| 9 | 10 | ||
| 10 | # Initialize Automake | 11 | # Initialize Automake |
| 11 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | 12 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
| @@ -21,11 +22,7 @@ AC_PROG_LIBTOOL | |||
| 21 | AC_PROG_CC | 22 | AC_PROG_CC |
| 22 | AC_PROG_INSTALL | 23 | AC_PROG_INSTALL |
| 23 | 24 | ||
| 24 | # Initialize X.Org macros | 25 | PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.0]) |
| 25 | m4_ifndef([XORG_MACROS_VERSION], | ||
| 26 | [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])]) | ||
| 27 | XORG_MACROS_VERSION(1.5) | ||
| 28 | XORG_DEFAULT_OPTIONS | ||
| 29 | 26 | ||
| 30 | AC_CONFIG_FILES([Makefile | 27 | AC_CONFIG_FILES([Makefile |
| 31 | src/Makefile | 28 | src/Makefile |
