Skip to contentSkip to conversation

configure: Don't link the driver against libX11

PATCH In review Adam Jackson 2 participants 2 messages Jun 3, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configure: Don't link the driver against libX11

78dc0c04745ad4485b994f67833f4a155749f01d added REQUIRED_MODULES to the driver link line for... some reason. That pulled in the libs from the XF86DRI check, which near as I can tell has always been wrong, all of the other extension checks just look for the protocol module and xextproto doesn't define dri1 protocol in any case.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure.ac +1 -1
index 353f942..30bed3e 100644
@@ -330,7 +330,7 @@ fi
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
+XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Obtain compiler/linker options for the driver dependencies
Signature · 1 line
1.9.0
#1 lore raw
Quoted 7 lines · Adam Jackson

78dc0c04745ad4485b994f67833f4a155749f01d added REQUIRED_MODULES to the driver link line for... some reason. That pulled in the libs from the XF86DRI check, which near as I can tell has always been wrong, all of the other extension checks just look for the protocol module and xextproto doesn't define dri1 protocol in any case.

Thanks, pushed. I then took it a step further and dropped xf86driproto from our pkg-config $REQUIRED_MODULES check and made it only required for DRI support with i810.
-Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre