diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-04-15 17:58:07 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-16 09:28:50 +1000 |
| commit | 9be9ab331210aed2a3045f60d3d8a0d13d9ea0ef (patch) | |
| tree | 27f3f586b49b563a423e308a92ef3952e143e4f3 /configure.ac | |
| parent | 659daa11dc558a45bfad1b9548f1757fab226ad7 (diff) | |
config: fix checking for extensions section
A hidden dependency on statement order was discovered.
The REQUIRE_MODULES variable was removed but needed.
Comments added to clarify the situation.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 7603b1e..2ee7797 100644 --- a/configure.ac +++ b/configure.ac @@ -58,8 +58,12 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION([1.4]) XORG_DEFAULT_OPTIONS -# Obtain compiler/linker options for the wacom driver -PKG_CHECK_MODULES(XORG, xorg-server xproto) +# Store the list of server defined extensions in REQUIRED_MODULES +XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) + +# Obtain compiler/linker options from server and required extensions +PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) + # Obtain compiler/linker options for the xsetwacom tool PKG_CHECK_MODULES(X11, x11 xi) @@ -83,9 +87,6 @@ AC_ARG_WITH(xorg-module-dir, inputdir=${moduledir}/input AC_SUBST(inputdir) -# Checks for extensions -XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) - # X Server SDK location is required to install wacom header files # This location is also relayed in the xorg-wacom.pc file sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` |