diff --git a/configure.ac b/configure.ac
index 073473b..000e297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,12 +93,6 @@ AC_SUBST(gl_cocoa_libs)
 EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"])
 AC_SUBST(wince_16_libs)
 
-# Wayland EGL
-EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "yes")
-
-# Wayland SHM
-EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "yes")
-
 ### Checks for programs
 
 AC_ISC_POSIX
@@ -197,14 +191,20 @@ have_wl_egl="no"
 if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then
     PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
     if test "x$have_wl" = "xyes"; then
-        AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support])
-        AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support])
+	EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "yes", 
+        [ 
+	  AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support])
+          AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support])
+	])
     fi
 
     if test "x$have_wl" = "xyes" -a "x$want_wayland_egl" = "xyes"; then
         PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wl_egl="yes"], [have_wl_egl="no"])
         if test "x$have_wl_egl" = "xyes"; then
-            AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support])
+	    EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "yes", 
+            [
+	      AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support])
+            ])
         fi
     fi
 fi