1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
From 483a4bb00e7dd2f14d86e167c8013c8638723c33 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu, 18 Feb 2016 17:19:09 +0000
Subject: [PATCH] build: Use AC_COMPILE_IFELSE
Instead of AC_TRY_COMPILE, which has been deprecated by newer autoconf.
---
Upstream-Status: Backport
Signed-off-by: Khem Raj <raj.khem@gmail.com>
configure.ac | 66 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4d72e0c..8ca3f94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,24 +348,25 @@ AS_IF([test "x$enable_wayland" != xno],
# We need to manually check for Wayland support in Cogl because
# the windowing systems are not exposed in the pkg-config file
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_TRY_COMPILE([#include <cogl/cogl.h>],
- [
- #ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
- #error "No Wayland support in Cogl"
- #endif
- int main (void) { return 0; }
- ],
- [
- AC_MSG_RESULT(yes)
- have_cogl_wayland=yes
- ],
- [
- AC_MSG_RESULT(no)
- have_cogl_wayland=no
- ])
+
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <cogl/cogl.h>
+]],
+[[
+#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(no)
+ have_cogl_wayland=no
+ ])
+
CFLAGS="${saved_CFLAGS}"
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
# the windowing systems are not exposed in the pkg-config file
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_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.")])
PKG_CHECK_EXISTS([mirclient],
--
1.9.1
|
