Clean up the detection of XI2

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index 32a78335a8cdcc0dd590bd9f8b594acf0260dde9..6dd2b25aa5e96cd05170247f68d571d8a555bcfc 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -81,6 +81,7 @@ static entry drivers[] =
      "",
      version
     },
+#if HAVE_XI2
     { "create-master",
       "<id> [sendCore (dflt:1)] [enable (dflt:1)]",
       create_master
@@ -101,6 +102,7 @@ static entry drivers[] =
       "<window> <device>",
       set_clientpointer
     },
+#endif
     {0, 0, 0
     }
 };
@@ -111,7 +113,11 @@ is_xinput_present(Display  *display)
     XExtensionVersion  *version;
     Bool               present;
 
+#if HAVE_XI2
+    version = XQueryInputVersion(display, XI_2_Major, XI_2_Minor);
+#else
     version = XGetExtensionVersion(display, INAME);
+#endif
 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
        present = version->present;