isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-12 17:27:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Use AC_COMPILE_IFELSE

Browse Source 
Instead of AC_TRY_COMPILE, which has been deprecated by newer autoconf.
This commit is contained in:
Emmanuele Bassi 2016-02-18 17:19:09 +00:00
parent 86bc2f43bc
commit 483a4bb00e
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
configure.ac
View File

@ -348,24 +348,25 @@ AS_IF([test "x$enable_wayland" != xno],
# We need to manually check for Wayland support in Cogl because # We need to manually check for Wayland support in Cogl because
# the windowing systems are not exposed in the pkg-config file # the windowing systems are not exposed in the pkg-config file
saved_CFLAGS="${CFLAGS}" saved_CFLAGS="${CFLAGS}"
CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`"
AC_MSG_CHECKING([for Wayland Cogl backend]) AC_MSG_CHECKING([for Wayland Cogl backend])
AC_TRY_COMPILE([#include <cogl/cogl.h>],
[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT #include <cogl/cogl.h>
#error "No Wayland support in Cogl" ]],
#endif [[
int main (void) { return 0; } #ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
], #error Cogl compiled without Wayland support
[ #endif
AC_MSG_RESULT(yes) ]])], [
have_cogl_wayland=yes AC_MSG_RESULT(yes)
], have_cogl_wayland=yes
[ ], [
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
have_cogl_wayland=no have_cogl_wayland=no
]) ])
CFLAGS="${saved_CFLAGS}" CFLAGS="${saved_CFLAGS}"
AS_IF([test "x$have_cogl_wayland" = xyes], AS_IF([test "x$have_cogl_wayland" = xyes],
[ [
@ -499,26 +500,25 @@ AS_IF([test "x$enable_mir" = "xyes"],
# We need to manually check for Mir support in Cogl because # We need to manually check for Mir support in Cogl because
# the windowing systems are not exposed in the pkg-config file # the windowing systems are not exposed in the pkg-config file
saved_CFLAGS="${CFLAGS}" saved_CFLAGS="${CFLAGS}"
CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`"
AC_MSG_CHECKING([for Mir Cogl backend]) AC_MSG_CHECKING([for Mir Cogl backend])
AC_TRY_COMPILE([#include <cogl/cogl.h>],
[
#ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
#error "No Mir support in Cogl"
#endif
int main (void) { return 0; }
],
[
AC_MSG_RESULT(yes)
have_cogl_mir=yes
],
[
AC_MSG_RESULT(no)
have_cogl_mir=no
])
CFLAGS="${saved_CFLAGS}" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <cogl/cogl.h>
]],
[[
#ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
#error Cogl compiled without Mir support
#endif
]])], [
AC_MSG_RESULT(yes)
have_cogl_mir=yes
], [
AC_MSG_RESULT(no)
have_cogl_mir=no
])
AS_IF([test "x$have_cogl_mir" = xno], [AC_MSG_ERROR("*** Cogl is missing Mir support.")]) AS_IF([test "x$have_cogl_mir" = xno], [AC_MSG_ERROR("*** Cogl is missing Mir support.")])
PKG_CHECK_EXISTS([mirclient], PKG_CHECK_EXISTS([mirclient],