diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-05 10:44:43 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-06 18:58:43 +1000 |
| commit | 5c35d07c3b0fc8cc60fc622d6eb444bea2be0acc (patch) | |
| tree | 44db7460a97ee65e56c40cd129de45fef52a7f1f | |
| parent | b6016134b53587b8f942243d95729bb902c58db4 (diff) | |
| download | xserver-5c35d07c3b0fc8cc60fc622d6eb444bea2be0acc.tar.gz | |
Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1
libXtst requirement is already implicit since we require xextproto 7.1 and
that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless,
list it explicitly.
Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1.
Complementing that is libdmx 1.0.99.1 with the dmxext.h header file.
Reported-by: Mark Rosenstand
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit c629e0fc50dfaffaa40a56709da7f035c289fed2)
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 9425bc964..c3dc10d5e 100644 --- a/configure.ac +++ b/configure.ac @@ -734,11 +734,13 @@ REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]" dnl List of libraries that require a specific version LIBAPPLEWM="applewm >= 1.4" +LIBDMX="dmx >= 1.0.99.1" LIBDRI="dri >= 7.1.0" LIBDRM="libdrm >= 2.3.0" LIBGL="gl >= 7.1.0" LIBXEXT="xext >= 1.0.99.4" LIBXI="xi >= 1.2.99.1" +LIBXTST="xtst >= 1.0.99.2" LIBPCIACCESS="pciaccess >= 0.8.0" LIBGLIB="glib-2.0 >= 2.16" @@ -1817,13 +1819,13 @@ dnl Linux sources in DMX require <linux/keyboard.h> PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11]) AC_SUBST(XDMXCONFIG_DEP_CFLAGS) AC_SUBST(XDMXCONFIG_DEP_LIBS) - PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx $LIBXEXT x11]) + PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11]) AC_SUBST(DMXEXAMPLES_DEP_LIBS) - PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu $LIBXEXT x11]) + PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [$LIBDMX xmu $LIBXEXT x11]) AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS) - PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx $LIBXI $LIBXEXT x11]) + PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [$LIBDMX $LIBXI $LIBXEXT x11]) AC_SUBST(DMXXIEXAMPLES_DEP_LIBS) - PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst $LIBXEXT x11]) + PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [$LIBXTST $LIBXEXT x11]) AC_SUBST(XTSTEXAMPLES_DEP_LIBS) PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres $LIBXEXT x11]) AC_SUBST(XRESEXAMPLES_DEP_LIBS) |