diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2020-07-07 13:39:31 +0100 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2020-07-07 13:39:31 +0100 |
commit | 7c4bebe47e1f6a7dfee8d370e53bbc61e47025e0 (patch) | |
tree | 84ab6189a5ff8af223a66da338a2864f014e405b /configure.ac | |
parent | d6a3eb3dec95730074bcd64df66261072bfc9111 (diff) |
Windows: remove Evil dependency, general cleanup for Windows
Test Plan: compilation and execution
Reviewers: raster
Differential Revision: https://phab.enlightenment.org/D12039
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 69 |
1 files changed, 1 insertions, 68 deletions
diff --git a/configure.ac b/configure.ac index e22bdd8..b63a19a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -10,7 +10,7 @@ AC_CONFIG_HEADERS([config.h]) | |||
10 | AC_CANONICAL_BUILD | 10 | AC_CANONICAL_BUILD |
11 | AC_CANONICAL_HOST | 11 | AC_CANONICAL_HOST |
12 | 12 | ||
13 | AM_INIT_AUTOMAKE([1.6 dist-bzip2]) | 13 | AM_INIT_AUTOMAKE([1.6 dist-xz]) |
14 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | 14 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
15 | 15 | ||
16 | PKG_PROG_PKG_CONFIG | 16 | PKG_PROG_PKG_CONFIG |
@@ -18,36 +18,10 @@ PKG_PROG_PKG_CONFIG | |||
18 | 18 | ||
19 | ### Checks for programs | 19 | ### Checks for programs |
20 | 20 | ||
21 | AC_ISC_POSIX | ||
22 | m4_ifdef([AC_PROG_OBJC], | ||
23 | [ | ||
24 | AC_PROG_OBJC | ||
25 | _AM_DEPENDENCIES(OBJC) | ||
26 | ], | ||
27 | [ | ||
28 | AC_CHECK_TOOL([OBJC], [gcc]) | ||
29 | AC_SUBST([OBJC]) | ||
30 | AC_SUBST([OBJCFLAGS]) | ||
31 | ] | ||
32 | ) | ||
33 | AC_PROG_CXX | ||
34 | AC_PROG_CC | 21 | AC_PROG_CC |
35 | 22 | ||
36 | LT_PROG_RC | ||
37 | |||
38 | |||
39 | |||
40 | ### Checks for libraries | 23 | ### Checks for libraries |
41 | 24 | ||
42 | # Evil library for compilation on Windows | ||
43 | |||
44 | case "$host_os" in | ||
45 | mingw32*) | ||
46 | PKG_CHECK_MODULES([EVIL], [evil >= 1.7.99]) | ||
47 | AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed]) | ||
48 | ;; | ||
49 | esac | ||
50 | |||
51 | # EFL dependencies | 25 | # EFL dependencies |
52 | efl_version="1.23.0" | 26 | efl_version="1.23.0" |
53 | requirement_expedite=" \ | 27 | requirement_expedite=" \ |
@@ -66,20 +40,14 @@ PKG_CHECK_MODULES([EFL], [${requirement_expedite}]) | |||
66 | EFL_ENABLE_EO_API_SUPPORT | 40 | EFL_ENABLE_EO_API_SUPPORT |
67 | EFL_ENABLE_BETA_API_SUPPORT | 41 | EFL_ENABLE_BETA_API_SUPPORT |
68 | 42 | ||
69 | |||
70 | ### Checks for header files | 43 | ### Checks for header files |
71 | 44 | ||
72 | |||
73 | ### Checks for types | 45 | ### Checks for types |
74 | 46 | ||
75 | |||
76 | ### Checks for structures | 47 | ### Checks for structures |
77 | 48 | ||
78 | |||
79 | ### Checks for compiler characteristics | 49 | ### Checks for compiler characteristics |
80 | 50 | ||
81 | AC_HEADER_STDC | ||
82 | AC_C_CONST | ||
83 | AC_PROG_CC_C99 | 51 | AC_PROG_CC_C99 |
84 | AM_PROG_CC_C_O | 52 | AM_PROG_CC_C_O |
85 | AC_C___ATTRIBUTE__ | 53 | AC_C___ATTRIBUTE__ |
@@ -88,43 +56,8 @@ if test "x${ac_cv_prog_cc_c99}" = "xno" ; then | |||
88 | AC_MSG_ERROR([expedite requires a c99-capable compiler]) | 56 | AC_MSG_ERROR([expedite requires a c99-capable compiler]) |
89 | fi | 57 | fi |
90 | 58 | ||
91 | WIN32_CFLAGS="" | ||
92 | case "$host_os" in | ||
93 | cegcc*) | ||
94 | WIN32_CFLAGS="-mwin32" | ||
95 | ;; | ||
96 | esac | ||
97 | AC_SUBST(WIN32_CFLAGS) | ||
98 | |||
99 | EXPEDITE_CXXFLAGS="" | ||
100 | AC_LANG_PUSH([C++]) | ||
101 | CXXFLAGS_save="${CXXFLAGS}" | ||
102 | CXXFLAGS="${CXXFLAGS} -fno-rtti -fno-exceptions" | ||
103 | AC_LINK_IFELSE( | ||
104 | [AC_LANG_PROGRAM([[]])], | ||
105 | [have_cxx_flags="yes"], | ||
106 | [have_cxx_flags="no"]) | ||
107 | AC_MSG_CHECKING([whether the compiler supports -fno-rtti -fno-exceptions]) | ||
108 | AC_MSG_RESULT([${have_cxx_flags}]) | ||
109 | CXXFLAGS="${CXXFLAGS_save}" | ||
110 | if test "x${have_cxx_flags}" = "xyes" ; then | ||
111 | EXPEDITE_CXXFLAGS="-fno-rtti -fno-exceptions" | ||
112 | fi | ||
113 | AC_LANG_POP([C++]) | ||
114 | AC_SUBST(EXPEDITE_CXXFLAGS) | ||
115 | |||
116 | |||
117 | ### Checks for linker characteristics | 59 | ### Checks for linker characteristics |
118 | 60 | ||
119 | lt_enable_auto_import="" | ||
120 | case "$host_os" in | ||
121 | mingw* | cegcc*) | ||
122 | lt_enable_auto_import="-Wl,--enable-auto-import" | ||
123 | ;; | ||
124 | esac | ||
125 | AC_SUBST(lt_enable_auto_import) | ||
126 | |||
127 | |||
128 | ### Checks for library functions | 61 | ### Checks for library functions |
129 | 62 | ||
130 | AC_CHECK_FUNCS([sync]) | 63 | AC_CHECK_FUNCS([sync]) |