[PATCH input-synaptics 1/5] Use appropriate Autoconf statements to check for prerequisites

Gaetan Nadon memsize at videotron.ca
Mon Jun 13 16:43:27 PDT 2011


Using m4 to check for macro defined by the xserver to ensure it is installed
will work as long as the macro is not removed. The preferred way of checking
for dependencies is to use PKG_CHECK_MODULE.

The check for XORG_MACROS_VERSION was done this way because there was no
pkgconfig file for the module. It should not be a pattern to follow.

The error message from PKG_CHECK_MODULES is much more informative.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---

All other 55 drivers have the same issue. Many other modules have similar issues where "things" from dependencies are used before the presence of the dependency has been established. You may not want to bother with this at all.

 configure.ac |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index bf99958..2bef998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,9 +48,10 @@ XORG_ENABLE_UNIT_TESTS
 # Checks for libraries.
 AC_CHECK_LIB([m], [rint])
 
+# Ensure xserver is installed before using XORG_DRIVER_CHECK_EXT
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6])
+
 # Store the list of server defined optional extensions in REQUIRED_MODULES
-m4_ifndef([XORG_DRIVER_CHECK_EXT],
-          [m4_fatal([must install xorg-server development files before running autoconf/autogen])])
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 
 # Obtain compiler/linker options for the Synaptics driver dependencies
-- 
1.7.4.1



More information about the xorg-devel mailing list