summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac32
1 files changed, 7 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac
index 000e297..9da279c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,7 @@ AC_SUBST(gl_cocoa_libs)
93EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"]) 93EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"])
94AC_SUBST(wince_16_libs) 94AC_SUBST(wince_16_libs)
95 95
96
96### Checks for programs 97### Checks for programs
97 98
98AC_ISC_POSIX 99AC_ISC_POSIX
@@ -185,33 +186,14 @@ fi
185AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes") 186AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes")
186 187
187# Wayland 188# Wayland
189EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "no")
190EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "no")
188 191
189have_wl="no" 192have_wl="no"
190have_wl_egl="no" 193if test "x$have_wayland_shm" = "xyes" -o "x$have_wayland_egl" = "xyes"; then
191if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then 194 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
192 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
193 if test "x$have_wl" = "xyes"; then
194 EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "yes",
195 [
196 AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support])
197 AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support])
198 ])
199 fi
200
201 if test "x$have_wl" = "xyes" -a "x$want_wayland_egl" = "xyes"; then
202 PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wl_egl="yes"], [have_wl_egl="no"])
203 if test "x$have_wl_egl" = "xyes"; then
204 EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "yes",
205 [
206 AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support])
207 ])
208 fi
209 fi
210fi 195fi
211
212AM_CONDITIONAL(BUILD_WAYLAND, test "x$have_wl" = "xyes") 196AM_CONDITIONAL(BUILD_WAYLAND, test "x$have_wl" = "xyes")
213AM_CONDITIONAL(BUILD_WAYLAND_SHM, test "x$have_wl" = "xyes")
214AM_CONDITIONAL(BUILD_WAYLAND_EGL, test "x$have_wl_egl" = "xyes")
215 197
216### Checks for header files 198### Checks for header files
217 199
@@ -297,8 +279,8 @@ echo " FB...........................: ${have_fb}"
297echo " DirectFB.....................: ${have_directfb}" 279echo " DirectFB.....................: ${have_directfb}"
298echo " PSL1GHT......................: ${have_psl1ght}" 280echo " PSL1GHT......................: ${have_psl1ght}"
299echo " Software WinCE 16 bits.......: ${have_software_16_wince}" 281echo " Software WinCE 16 bits.......: ${have_software_16_wince}"
300echo " Wayland EGL..................: ${have_wl}" 282echo " Wayland EGL..................: ${have_wayland_egl}"
301echo " Wayland SHM..................: ${have_wl_egl}" 283echo " Wayland SHM..................: ${have_wayland_shm}"
302echo 284echo
303echo " Installation:" 285echo " Installation:"
304echo " prefix.......................: ${prefix}" 286echo " prefix.......................: ${prefix}"