From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Tue, 31 May 2011 09:14:46 +0000 (+0200)
Subject: st/egl: Fix udev linkage when egl_dri2 is not build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7cd65fb38a3ece6202d3675a543785c10f0932a;p=mesa.git

st/egl: Fix udev linkage when egl_dri2 is not build
---

diff --git a/configure.ac b/configure.ac
index b55473ffec9..510d23f41bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1202,6 +1202,9 @@ if test "x$enable_egl" = xyes; then
 
         PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
                           [have_libudev=yes],[have_libudev=no])
+        if test "$have_libudev" = yes; then
+            DEFINES="$DEFINES -DHAVE_LIBUDEV"
+        fi
         if test "$mesa_driver" = dri; then
             # build egl_dri2 when xcb-dri2 is available
             PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],
@@ -1210,9 +1213,6 @@ if test "x$enable_egl" = xyes; then
             if test "$have_xcb_dri2" = yes; then
                 EGL_DRIVER_DRI2=dri2
                 DEFINES="$DEFINES -DHAVE_XCB_DRI2"
-                if test "$have_libudev" = yes; then
-                    DEFINES="$DEFINES -DHAVE_LIBUDEV"
-                fi
                 # workaround a bug in xcb-dri2 generated by xcb-proto 1.6
                 AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],
                           [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"])
diff --git a/src/gallium/targets/egl/Makefile b/src/gallium/targets/egl/Makefile
index a455b61af98..dd566bd9a06 100644
--- a/src/gallium/targets/egl/Makefile
+++ b/src/gallium/targets/egl/Makefile
@@ -52,7 +52,7 @@ egl_LIBS += $(TOP)/src/gallium/winsys/sw/wayland/libws_wayland.a
 egl_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
 endif
 ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
-egl_SYS += $(LIBDRM_LIB)
+egl_SYS += $(LIBUDEV_LIBS) $(LIBDRM_LIB)
 endif
 ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),)
 egl_LIBS += $(TOP)/src/gallium/winsys/sw/fbdev/libfbdev.a