summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--configure.ac570
-rw-r--r--data/desktop/Makefile.am2
-rw-r--r--elementary.pc.in2
-rw-r--r--src/bin/Makefile.am5
-rw-r--r--src/edje_externals/Makefile.am3
-rw-r--r--src/lib/Makefile.am11
-rw-r--r--src/modules/access_output/Makefile.am7
-rw-r--r--src/modules/datetime_input_ctxpopup/Makefile.am5
-rw-r--r--src/modules/prefs/Makefile.am9
-rw-r--r--src/modules/test_entry/Makefile.am7
-rw-r--r--src/modules/test_map/Makefile.am5
-rw-r--r--src/tests/Makefile.am6
12 files changed, 342 insertions, 290 deletions
diff --git a/configure.ac b/configure.ac
index c076de52d..6ecf4ec44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
1EFL_VERSION([1], [11], [99], [dev]) 1EFL_VERSION([1], [11], [99], [dev])
2AC_INIT([elementary], [efl_version], [enlightenment-devel@lists.sourceforge.net]) 2AC_INIT([elementary], [efl_version], [enlightenment-devel@lists.sourceforge.net])
3 3
4AC_PREREQ(2.60) 4AC_PREREQ(2.63)
5AC_CONFIG_SRCDIR([configure.ac]) 5AC_CONFIG_SRCDIR([configure.ac])
6AC_CONFIG_MACRO_DIR([m4]) 6AC_CONFIG_MACRO_DIR([m4])
7AC_CANONICAL_BUILD 7AC_CANONICAL_BUILD
@@ -18,118 +18,151 @@ AH_BOTTOM([
18 18
19AC_USE_SYSTEM_EXTENSIONS 19AC_USE_SYSTEM_EXTENSIONS
20 20
21AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-xz -Wall]) 21AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-xz -Wall])
22m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 22m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
23m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
23 24
24# pkg-config 25LT_INIT([win32-dll disable-static pic-only])
25PKG_PROG_PKG_CONFIG 26EFL_INIT
26 27
27MODULE_EDJE=`pkg-config --variable=module_arch edje`
28AC_SUBST(MODULE_EDJE)
29AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
30 28
31# Needs to be moved into a macro, and also, needs a way to automatically fetch 29### Additional options to configure
32# from all the dependencies using the Requires. 30
33DEPS_EOLIAN_FLAGS=`pkg-config --variable=eolian_flags eo evas edje ecore efl` 31# C++ bindings
34AC_SUBST(DEPS_EOLIAN_FLAGS) 32
33AC_ARG_ENABLE([cxx-bindings],
34 [AC_HELP_STRING([--disable-cxx-bindings],
35 [disable C++11 bindings. @<:@default=enabled@:>@])],
36 [want_cxx11="${enableval}"],
37 [want_cxx11="yes"])
38
39# Tests
40
41AC_ARG_WITH([tests],
42 [AS_HELP_STRING([--with-tests=none|regular],
43 [choose elementary testing method: regular or none.(coverage will be supported)@<:@default=none@:>@])],
44 [build_tests=${withval}],
45 [build_tests=none])
46
47# Elementary base dir
48
49AC_ARG_WITH([elementary-base-dir],
50 [AC_HELP_STRING([--with-elementary-base-dir=PATH], [specify the subdirectory for all elementary data @<:@default=${elementary_base_dir}@:>@])],
51 [elementary_base_dir=${withval}],
52 [elementary_base_dir=".elementary"])
53
54AC_MSG_NOTICE([ELEMENTARY_BASE_DIR set to ${elementary_base_dir}])
55AC_DEFINE_UNQUOTED([ELEMENTARY_BASE_DIR], ["${elementary_base_dir}"], ["subdirectory for all elementary data"])
56
57# Build and install examples
58
59EFL_CHECK_BUILD_EXAMPLES(
60 [enable_build_examples="yes"],
61 [enable_build_examples="no"])
62
63EFL_CHECK_INSTALL_EXAMPLES(
64 [enable_install_examples="yes"],
65 [enable_install_examples="no"])
66
67# Debug mode
68
69AC_ARG_ENABLE([debug],
70 [AC_HELP_STRING([--enable-debug], [enable elementary debug support. @<:@default=disabled@:>@])],
71 [want_elementary_debug=$enableval],
72 [want_elementary_debug="no"])
73
74ELM_DEBUG_DEF="#undef"
75if test "x$want_elementary_debug" = "xyes"; then
76 AC_DEFINE([HAVE_ELEMENTARY_DEBUG], [1], [Elementary debug.])
77 ELM_DEBUG_DEF="#define"
78fi
79AC_SUBST([ELM_DEBUG_DEF])
80
81# quicklaunch support
82
83AC_ARG_ENABLE([quick-launch],
84 [AC_HELP_STRING([--disable-quick-launch], [disable quick-launch support, @<:@default=detect@:>@])],
85 [want_quicklaunch=$enableval],
86 [want_quicklaunch="auto"])
87
88
89### Default options with respect to host and default values
90
91ELM_VERSION_MAJOR="v_maj"
92ELM_VERSION_MINOR="v_min"
93AC_SUBST([ELM_VERSION_MAJOR])
94AC_SUBST([ELM_VERSION_MINOR])
95
96MODULE_ARCH="v-v_maj.v_min.v_mic"
97AC_SUBST([MODULE_ARCH])
98AC_DEFINE_UNQUOTED([MODULE_ARCH], ["$MODULE_ARCH"], ["Module architecture"])
99
100EFL_SHARED_EXTENSION="${shrext_cmds}"
101AC_DEFINE_UNQUOTED([EFL_SHARED_EXTENSION], ["${EFL_SHARED_EXTENSION}"], ["Shared extension"])
35 102
36ELM_UNIX_DEF="#undef" 103ELM_UNIX_DEF="#undef"
37ELM_WIN32_DEF="#undef" 104ELM_WIN32_DEF="#undef"
38have_windows="no" 105have_windows="no"
39have_dlopen="no"
40have_freebsd="no" 106have_freebsd="no"
41case "$host_os" in 107
42 freebsd*)
43 have_freebsd="yes"
44 ;;
45esac
46case "$host_os" in 108case "$host_os" in
47 mingw*) 109 mingw*)
48 PKG_CHECK_MODULES([EVIL], [evil]) 110 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if evil package is installed.])
49 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
50 ELM_WIN32_DEF="#define" 111 ELM_WIN32_DEF="#define"
51 have_windows="yes" 112 have_windows="yes"
52dnl managed by evil
53 AC_DEFINE(HAVE_DLADDR)
54 have_dlopen="yes"
55 dlopen_libs=-ldl
56 requirement_elm="evil"
57 have_socket="no"
58 ;; 113 ;;
59 *solaris*) 114 *solaris*)
60 ELM_UNIX_DEF="#define" 115 ELM_UNIX_DEF="#define"
61 have_socket="yes" 116 ;;
62 have_dlopen="yes" 117 freebsd*)
63 AC_CHECK_LIB([socket], [connect], [], [have_socket="no"]) 118 ELM_UNIX_DEF="#define"
119 have_freebsd="yes"
64 ;; 120 ;;
65 darwin*) 121 darwin*)
66 ELM_UNIX_DEF="#define" 122 ELM_UNIX_DEF="#define"
67 have_socket="yes"
68 have_dlopen="yes"
69 AC_CHECK_HEADERS([crt_externs.h])
70 AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."])
71 ;; 123 ;;
72 *) 124 *)
73 ELM_UNIX_DEF="#define" 125 ELM_UNIX_DEF="#define"
74 AC_CHECK_FUNCS(dlopen, res=yes, res=no)
75 if test "x$res" = "xyes"; then
76 AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR))
77 have_dlopen="yes"
78 else
79 AC_CHECK_LIB(dl, dlopen, res=yes, res=no)
80 AC_CHECK_LIB(m, sincos)
81 if test "x$res" = "xyes"; then
82 AC_CHECK_LIB(dl, dladdr, AC_DEFINE(HAVE_DLADDR))
83 dlopen_libs=-ldl
84 have_dlopen="yes"
85 fi
86 fi
87 have_socket="yes"
88 ;; 126 ;;
89esac 127esac
90 128
91AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) 129AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"])
92AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"])
93AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"]) 130AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"])
131AC_SUBST([ELM_UNIX_DEF])
132AC_SUBST([ELM_WIN32_DEF])
94 133
95EFL_COMPILER_FLAG([-Wall -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections])
96EFL_LINKER_FLAG([-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries])
97 134
98m4_ifdef([v_mic], 135### Checks for programs
99 [
100 EFL_COMPILER_FLAG([-Wshadow])
101 EFL_COMPILER_FLAG([-Wall])
102 EFL_COMPILER_FLAG([-W])
103 ])
104 136
105m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) 137# gettext
106LT_INIT([win32-dll disable-static pic-only]) 138m4_ifdef([AM_GNU_GETTEXT_VERSION], [
107EFL_INIT 139AM_GNU_GETTEXT_VERSION([0.17])
140])
141
142m4_ifdef([AM_GNU_GETTEXT], [
143AM_GNU_GETTEXT([external])
144po_makefile_in=po/Makefile.in
145have_po="yes"
146],[
147have_po="no"
148])
149AC_SUBST([LTLIBINTL])
108 150
109AC_GNU_SOURCE 151if test "x${POSUB}" = "x" ; then
152 have_po="no"
153fi
110 154
111AC_C_BIGENDIAN 155AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
112AC_ISC_POSIX 156
157# compilers
113AC_PROG_CC 158AC_PROG_CC
114AC_PROG_CC_STDC 159AC_PROG_CC_STDC
115AC_HEADER_STDC
116AC_C_CONST
117AC_FUNC_ALLOCA
118AC_PROG_CXX 160AC_PROG_CXX
119 161
120ELM_VERSION_MAJOR="v_maj" 162EFL_CXX_COMPILE_STDCXX_11([ext])
121ELM_VERSION_MINOR="v_min"
122AC_SUBST(ELM_VERSION_MAJOR)
123AC_SUBST(ELM_VERSION_MINOR)
124
125MODULE_ARCH="v-v_maj.v_min.v_mic"
126AC_SUBST(MODULE_ARCH)
127AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
128
129EFL_SHARED_EXTENSION="${shrext_cmds}"
130AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension")
131 163
132requirement_elm="" 164# pkg-config
165PKG_PROG_PKG_CONFIG
133 166
134# Check whether pkg-config supports Requires.private 167# Check whether pkg-config supports Requires.private
135if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then 168if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
@@ -137,77 +170,40 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
137else 170else
138 pkgconfig_requires_private="Requires" 171 pkgconfig_requires_private="Requires"
139fi 172fi
140AC_SUBST(pkgconfig_requires_private) 173AC_SUBST([pkgconfig_requires_private])
141
142#================================================
143if test "x${prefix}" = "xNONE"; then
144 LOCALE_DIR="${ac_default_prefix}/share/locale"
145else
146 LOCALE_DIR="${prefix}/share/locale"
147fi
148AC_SUBST(LOCALE_DIR)
149#================================================
150elementary_icon_dir="${datadir}/icons"
151AC_SUBST(elementary_icon_dir)
152
153have_fork="no"
154want_quicklaunch="auto"
155AC_ARG_ENABLE([quick-launch],
156 [AC_HELP_STRING([--disable-quick-launch], [disable quick-launch support, @<:@default=detect@:>@])],
157 [want_quicklaunch=$enableval], [])
158 174
159# Check if we can build binary with quicklaunch support 175# doxygen
160ELM_QUICKLAUNCH 176EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
161 177
162if test "x$want_quicklaunch" != "xno"; then 178# EFL binaries
163 AC_CHECK_FUNCS(fork, [ 179EFL_WITH_BIN([eet], [eet-eet], [eet])
164 have_fork="yes" 180EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
165 AC_DEFINE(HAVE_FORK) 181EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen])
166 ]) 182EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc])
167 AC_CHECK_FUNCS([clearenv]) 183EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen])
168fi 184EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx])
169AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x$have_fork" = "xyes" && test "x$have_dlopen" = "xyes"]) 185# Force the helper to try external eolian generators
186AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true])
187AM_CONDITIONAL([HAVE_EOLIAN_CXX], [true])
170 188
171AC_CHECK_FUNCS([\ 189EFL_ENABLE_BIN([elementary-test])
172geteuid \ 190EFL_ENABLE_BIN([elementary-codegen])
173getuid \ 191EFL_ENABLE_BIN([elm-prefs-cc])
174]) 192EFL_ENABLE_BIN([elementary-config])
175 193
176AC_SUBST(dlopen_libs)
177AC_SUBST(ELM_UNIX_DEF)
178AC_SUBST(ELM_WIN32_DEF)
179 194
180AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"]) 195### Checks for libraries
181 196
182PKG_CHECK_MODULES([ELEMENTARY], 197requirement_elm=""
183 [
184 efl >= efl_version
185 eina >= efl_version
186 eet >= efl_version
187 evas >= efl_version
188 ecore >= efl_version
189 ecore-evas >= efl_version
190 ecore-file >= efl_version
191 ecore-input >= efl_version
192 edje >= efl_version
193 eo >= efl_version
194 ethumb_client >= efl_version
195 emotion >= efl_version
196 ecore-imf >= efl_version
197 ecore-con >= efl_version
198 eio >= efl_version
199 eldbus >= efl_version
200 efreet >= efl_version
201 efreet-mime >= efl_version
202 efreet-trash >= efl_version
203 eio >= efl_version
204 ]
205)
206 198
207EFL_ENABLE_EO_API_SUPPORT 199case "$host_os" in
208EFL_ENABLE_BETA_API_SUPPORT 200 mingw*)
201 requirement_elm="evil >= efl_version"
202 ;;
203esac
209 204
210requirement_elm="\ 205requirement_elm="\
206 ${requirement_elm} \
211 efl >= efl_version \ 207 efl >= efl_version \
212 eina >= efl_version \ 208 eina >= efl_version \
213 eet >= efl_version \ 209 eet >= efl_version \
@@ -230,12 +226,12 @@ requirement_elm="\
230 eio >= efl_version \ 226 eio >= efl_version \
231 " 227 "
232 228
233EFL_CXX_COMPILE_STDCXX_11([ext]) 229PKG_CHECK_MODULES([ELEMENTARY],
234want_cxx11="yes" 230 [${requirement_elm}])
235AC_ARG_ENABLE([cxx-bindings], 231
236 [AC_HELP_STRING([--disable-cxx-bindings], 232EFL_ENABLE_EO_API_SUPPORT
237 [disable C++11 bindings. @<:@default=enabled@:>@])], 233EFL_ENABLE_BETA_API_SUPPORT
238 [want_cxx11="${enableval}"]) 234
239 235
240if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then 236if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then
241 PKG_CHECK_MODULES([ELEMENTARY_CXX], 237 PKG_CHECK_MODULES([ELEMENTARY_CXX],
@@ -261,6 +257,181 @@ else
261fi 257fi
262AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" = "xyes"]) 258AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" = "xyes"])
263 259
260
261MODULE_EDJE=`${PKG_CONFIG} --variable=module_arch edje`
262AC_SUBST([MODULE_EDJE])
263AC_DEFINE_UNQUOTED([MODULE_EDJE], ["$MODULE_EDJE"], ["Edje module architecture"])
264
265# Needs to be moved into a macro, and also, needs a way to automatically fetch
266# from all the dependencies using the Requires.
267DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje ecore efl`
268AC_SUBST([DEPS_EOLIAN_FLAGS])
269
270my_libs="-lm"
271
272# sockets
273
274case "$host_os" in
275 mingw*)
276 have_socket="no"
277 ;;
278 *solaris*)
279 AC_CHECK_LIB([socket], [connect],
280 [
281 have_socket="yes"
282 my_libs="-lsocket ${my_libs}"
283 ],
284 [have_socket="no"])
285 ;;
286 darwin*)
287 have_socket="yes"
288 ;;
289 *)
290 have_socket="yes"
291 ;;
292esac
293
294AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"])
295
296# dlopen
297
298have_dlopen="no"
299case "$host_os" in
300 mingw*)
301dnl managed by evil
302 AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.])
303 have_dlopen="yes"
304 my_libs="-ldl ${my_libs}"
305 ;;
306 *solaris*)
307 have_dlopen="yes"
308 ;;
309 darwin*)
310 have_dlopen="yes"
311 ;;
312 *)
313 AC_CHECK_LIB([dl], [dlopen], [res=yes], [res=no])
314 if test "x$res" = "xyes"; then
315 AC_CHECK_LIB([dl], [dladdr], AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.]))
316 my_libs="-ldl ${my_libs}"
317 have_dlopen="yes"
318 fi
319 ;;
320esac
321
322AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"])
323
324AC_SUBST([my_libs])
325AC_SUBST([requirement_elm])
326
327# check unit testing library
328if test "${build_tests}" = "regular"; then
329 PKG_CHECK_MODULES([CHECK], [check >= 0.9.5])
330fi
331AM_CONDITIONAL([ENABLE_ELEMENTARY_TESTS], [test "${build_tests}" = "regular"])
332
333
334### Checks for header files
335
336ELM_ALLOCA_H_DEF="#undef"
337AC_CHECK_HEADER([alloca.h], [ELM_ALLOCA_H_DEF="#define"])
338AC_SUBST([ELM_ALLOCA_H_DEF])
339
340ELM_LIBINTL_H_DEF="#undef"
341AC_CHECK_HEADER([libintl.h], [ELM_LIBINTL_H_DEF="#define"])
342AC_SUBST([ELM_LIBINTL_H_DEF])
343
344ELM_DIRENT_H_DEF="#undef"
345AC_CHECK_HEADER([dirent.h], [ELM_DIRENT_H_DEF="#define"])
346AC_SUBST([ELM_DIRENT_H_DEF])
347
348AC_CHECK_HEADER([sys/mman.h], [have_mman="yes"], [have_mman="no"])
349if test "x${have_mman}" = "xyes"; then
350 AC_DEFINE([HAVE_MMAN_H], [1], [Have sys/mman.h header file])
351fi
352
353AC_CHECK_HEADERS([locale.h langinfo.h sys/times.h])
354
355case "$host_os" in
356 darwin*)
357 AC_CHECK_HEADERS([crt_externs.h])
358 ;;
359esac
360
361
362### Checks for types
363
364
365### Checks for structures
366
367
368### Checks for compiler characteristics
369
370AC_C_BIGENDIAN
371
372m4_ifdef([v_mic],
373 [
374 EFL_COMPILER_FLAG([-Wshadow])
375 EFL_COMPILER_FLAG([-Wall])
376 EFL_COMPILER_FLAG([-W])
377 ])
378
379EFL_COMPILER_FLAG([-Wall -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections])
380
381EFL_CHECK_PATH_MAX
382
383
384### Checks for linker characteristics
385
386EFL_LINKER_FLAG([-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries])
387
388# Check if we can build binary with quicklaunch support
389ELM_QUICKLAUNCH
390
391
392### Checks for library functions
393
394AC_FUNC_ALLOCA
395
396AC_CHECK_FUNCS([geteuid getuid])
397
398if test "x${want_quicklaunch}" != "xno"; then
399 AC_CHECK_FUNCS([fork clearenv])
400fi
401
402if test "x${have_dlopen}" = "xno"; then
403 AC_CHECK_FUNCS([dlopen dladdr])
404fi
405
406if test "x${ac_cv_func_dlopen}" = "xyes"; then
407 have_dlopen="yes"
408fi
409
410AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x${ac_cv_func_fork}" = "xyes" && test "x${have_dlopen}" = "xyes"])
411
412# environ variable
413
414AC_COMPILE_IFELSE(
415 [AC_LANG_PROGRAM(
416 [[
417# define _GNU_SOURCE 1
418#include <unistd.h>
419 ]],
420 [[
421extern char **environ;
422 ]])
423 ],
424 [AC_DEFINE([HAVE_ENVIRON], [1], [extern environ exists])])
425
426case "$host_os" in
427 darwin*)
428 AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."])
429 ;;
430esac
431
432
433
434
264have_elementary_x="no" 435have_elementary_x="no"
265want_elementary_x="auto" 436want_elementary_x="auto"
266AC_ARG_ENABLE([ecore-x], 437AC_ARG_ENABLE([ecore-x],
@@ -581,113 +752,6 @@ if test "x$elementary_web_backend" = "xewebkit2"; then
581fi 752fi
582AC_SUBST(ELM_WEB2_DEF) 753AC_SUBST(ELM_WEB2_DEF)
583 754
584ELM_DEBUG_DEF="#undef"
585want_elementary_debug="no"
586AC_ARG_ENABLE([debug],
587 [AC_HELP_STRING([--enable-debug], [enable elementary debug support. @<:@default=disabled@:>@])],
588 [want_elementary_debug=$enableval], [])
589
590if test "x$want_elementary_debug" = "xyes"; then
591 AC_DEFINE(HAVE_ELEMENTARY_DEBUG, 1, [Elementary debug.])
592 ELM_DEBUG_DEF="#define"
593fi
594AC_SUBST(ELM_DEBUG_DEF)
595
596AC_ARG_WITH([tests],
597 [AC_HELP_STRING([--with-tests=none|regular],
598 [choose elementary testing method: regular or none.(coverage will be supported)@<:@default=none@:>@])],
599 [build_tests=${withval}],
600 [build_tests=none])
601
602if test "${build_tests}" = "regular"; then
603 PKG_CHECK_MODULES([CHECK], [check >= 0.9.5])
604fi
605AM_CONDITIONAL([ENABLE_ELEMENTARY_TESTS], [test "${build_tests}" = "regular"])
606
607ELM_ALLOCA_H_DEF="#undef"
608AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"])
609AC_SUBST(ELM_ALLOCA_H_DEF)
610
611ELM_LIBINTL_H_DEF="#undef"
612AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"])
613AC_SUBST(ELM_LIBINTL_H_DEF)
614
615ELM_DIRENT_H_DEF="#undef"
616AC_CHECK_HEADER(dirent.h, [ELM_DIRENT_H_DEF="#define"])
617AC_SUBST(ELM_DIRENT_H_DEF)
618
619AC_CHECK_HEADER(sys/mman.h, [have_mman="yes"], [have_mman="no"])
620if test "x${have_mman}" = "xyes"; then
621 AC_DEFINE(HAVE_MMAN_H, 1, [Have sys/mman.h header file])
622fi
623
624AC_CHECK_HEADERS([locale.h langinfo.h sys/times.h])
625
626my_libs="-lm"
627AC_SUBST(my_libs)
628AC_SUBST(requirement_elm)
629
630
631EFL_WITH_BIN([eet], [eet-eet], [eet])
632EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
633EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen])
634EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc])
635EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen])
636EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx])
637# Force the helper to try external eolian generators
638AM_CONDITIONAL(HAVE_EOLIAN_GEN, [true])
639AM_CONDITIONAL(HAVE_EOLIAN_CXX, [true])
640
641EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
642
643EFL_ENABLE_BIN([elementary-test])
644EFL_ENABLE_BIN([elementary-codegen])
645EFL_ENABLE_BIN([elm-prefs-cc])
646EFL_ENABLE_BIN([elementary-config])
647
648m4_ifdef([AM_GNU_GETTEXT_VERSION], [
649AM_GNU_GETTEXT_VERSION([0.17])
650])
651
652m4_ifdef([AM_GNU_GETTEXT], [
653AM_GNU_GETTEXT([external])
654po_makefile_in=po/Makefile.in
655have_po="yes"
656],[
657have_po="no"
658])
659AC_SUBST(LTLIBINTL)
660
661if test "x${POSUB}" = "x" ; then
662 have_po="no"
663fi
664
665AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
666
667EFL_CHECK_PATH_MAX
668
669elementary_base_dir=".elementary"
670AC_ARG_WITH([elementary-base-dir],
671 [AC_HELP_STRING([--with-elementary-base-dir=PATH], [specify the subdirectory for all elementary data @<:@default=${elementary_base_dir}@:>@])],
672 [elementary_base_dir=${withval}],
673 [elementary_base_dir=".elementary"])
674
675AC_MSG_NOTICE([ELEMENTARY_BASE_DIR set to ${elementary_base_dir}])
676AC_DEFINE_UNQUOTED(ELEMENTARY_BASE_DIR, "${elementary_base_dir}", "subdirectory for all elementary data")
677
678### Build and install examples
679EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
680EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"])
681
682AC_TRY_COMPILE([
683# define _GNU_SOURCE 1
684#include <unistd.h>
685], [
686extern char **environ;
687], [
688 AC_DEFINE(HAVE_ENVIRON, 1, [extern environ exists])
689])
690
691AC_CONFIG_FILES([ 755AC_CONFIG_FILES([
692Makefile 756Makefile
693elementary.spec 757elementary.spec
@@ -757,7 +821,7 @@ echo " Features:"
757echo " EWeather...............: ${have_elementary_eweather}" 821echo " EWeather...............: ${have_elementary_eweather}"
758echo " EMap...................: ${have_elementary_emap}" 822echo " EMap...................: ${have_elementary_emap}"
759echo " Web (WebKit)...........: ${elementary_web}" 823echo " Web (WebKit)...........: ${elementary_web}"
760echo " Quick Launch...........: ${have_fork}" 824echo " Quick Launch...........: ${ac_cv_func_fork}"
761echo " Elocation..............: ${have_elementary_elocation}" 825echo " Elocation..............: ${have_elementary_elocation}"
762echo 826echo
763echo " eet......................: ${eet_eet}" 827echo " eet......................: ${eet_eet}"
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
index fe8c41962..c49fe4e7f 100644
--- a/data/desktop/Makefile.am
+++ b/data/desktop/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
4desktopdir = $(datadir)/applications 4desktopdir = $(datadir)/applications
5desktop_DATA = elementary_test.desktop elementary_config.desktop 5desktop_DATA = elementary_test.desktop elementary_config.desktop
6 6
7icondir = $(elementary_icon_dir) 7icondir = $(datadir)/icons
8icon_DATA = elementary.png 8icon_DATA = elementary.png
9 9
10EXTRA_DIST = $(desktop_DATA) $(icon_DATA) 10EXTRA_DIST = $(desktop_DATA) $(icon_DATA)
diff --git a/elementary.pc.in b/elementary.pc.in
index 4e26dec58..3c880fdff 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -13,5 +13,5 @@ Name: elementary
13Description: Mobile device touchscreen widget library 13Description: Mobile device touchscreen widget library
14@pkgconfig_requires_private@: @requirement_elm@ 14@pkgconfig_requires_private@: @requirement_elm@
15Version: @VERSION@ 15Version: @VERSION@
16Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @EVIL_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@ 16Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@
17Cflags: -I${includedir}/elementary-@VMAJ@ 17Cflags: -I${includedir}/elementary-@VMAJ@
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f4f6e4600..b86dc2db6 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
9-I$(top_srcdir)/src/bin \ 9-I$(top_srcdir)/src/bin \
10-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 12-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
13@ELEMENTARY_CFLAGS@ \ 13@ELEMENTARY_CFLAGS@ \
14@ELEMENTARY_X_CFLAGS@ \ 14@ELEMENTARY_X_CFLAGS@ \
15@ELEMENTARY_FB_CFLAGS@ \ 15@ELEMENTARY_FB_CFLAGS@ \
@@ -20,8 +20,7 @@ AM_CPPFLAGS = \
20@ELEMENTARY_WEB_CFLAGS@ \ 20@ELEMENTARY_WEB_CFLAGS@ \
21@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
22@ELEMENTARY_WAYLAND_CFLAGS@ \ 22@ELEMENTARY_WAYLAND_CFLAGS@ \
23@ELEMENTARY_DRM_CFLAGS@ \ 23@ELEMENTARY_DRM_CFLAGS@
24@EVIL_CFLAGS@
25 24
26bin_PROGRAMS = \ 25bin_PROGRAMS = \
27@ELEMENTARY_TEST_PRG@ \ 26@ELEMENTARY_TEST_PRG@ \
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index ab4d73b4b..8357b73ee 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -17,8 +17,7 @@ AM_CPPFLAGS = \
17@ELEMENTARY_EMAP_CFLAGS@ \ 17@ELEMENTARY_EMAP_CFLAGS@ \
18@ELEMENTARY_WEB_CFLAGS@ \ 18@ELEMENTARY_WEB_CFLAGS@ \
19@ELEMENTARY_WAYLAND_CFLAGS@ \ 19@ELEMENTARY_WAYLAND_CFLAGS@ \
20@ELEMENTARY_DRM_CFLAGS@ \ 20@ELEMENTARY_DRM_CFLAGS@
21@EVIL_CFLAGS@
22 21
23if ELEMENTARY_WINDOWS_BUILD 22if ELEMENTARY_WINDOWS_BUILD
24AM_CPPFLAGS += -DELEMENTARY_BUILD 23AM_CPPFLAGS += -DELEMENTARY_BUILD
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 337e14c7c..4b4ca848b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -18,10 +18,10 @@ AM_CPPFLAGS = \
18-I$(top_srcdir)/src/imported \ 18-I$(top_srcdir)/src/imported \
19-I$(top_srcdir)/src/lib \ 19-I$(top_srcdir)/src/lib \
20-I$(top_builddir)/src/lib \ 20-I$(top_builddir)/src/lib \
21-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 21-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
22-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 22-DLOCALE_DIR=\"$(localedir)\" \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DICON_DIR=\"$(elementary_icon_dir)\" \ 24-DICON_DIR=\"$(datadir)/icons\" \
25@ELEMENTARY_CFLAGS@ \ 25@ELEMENTARY_CFLAGS@ \
26@ELEMENTARY_X_CFLAGS@ \ 26@ELEMENTARY_X_CFLAGS@ \
27@ELEMENTARY_FB_CFLAGS@ \ 27@ELEMENTARY_FB_CFLAGS@ \
@@ -32,8 +32,7 @@ AM_CPPFLAGS = \
32@ELEMENTARY_WEB_CFLAGS@ \ 32@ELEMENTARY_WEB_CFLAGS@ \
33@ELEMENTARY_EMAP_CFLAGS@ \ 33@ELEMENTARY_EMAP_CFLAGS@ \
34@ELEMENTARY_WAYLAND_CFLAGS@ \ 34@ELEMENTARY_WAYLAND_CFLAGS@ \
35@ELEMENTARY_DRM_CFLAGS@ \ 35@ELEMENTARY_DRM_CFLAGS@
36@EVIL_CFLAGS@
37 36
38if ELEMENTARY_WINDOWS_BUILD 37if ELEMENTARY_WINDOWS_BUILD
39AM_CPPFLAGS += -DELEMENTARY_BUILD 38AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -514,7 +513,6 @@ elu_ews_wm.c
514libelementary_la_CFLAGS = 513libelementary_la_CFLAGS =
515libelementary_la_LIBADD = \ 514libelementary_la_LIBADD = \
516@my_libs@ \ 515@my_libs@ \
517@dlopen_libs@ \
518@ELEMENTARY_LIBS@ \ 516@ELEMENTARY_LIBS@ \
519@ELEMENTARY_X_LIBS@ \ 517@ELEMENTARY_X_LIBS@ \
520@ELEMENTARY_FB_LIBS@ \ 518@ELEMENTARY_FB_LIBS@ \
@@ -525,7 +523,6 @@ libelementary_la_LIBADD = \
525@ELEMENTARY_EMAP_LIBS@ \ 523@ELEMENTARY_EMAP_LIBS@ \
526@ELEMENTARY_WAYLAND_LIBS@ \ 524@ELEMENTARY_WAYLAND_LIBS@ \
527@ELEMENTARY_DRM_LIBS@ \ 525@ELEMENTARY_DRM_LIBS@ \
528@EVIL_LIBS@ \
529@LTLIBINTL@ 526@LTLIBINTL@
530 527
531libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 528libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index 06b940f38..72906902e 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir) \ 7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib \ 8-I$(top_srcdir)/src/lib \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12@ELEMENTARY_CFLAGS@ \ 12@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 13@ELEMENTARY_X_CFLAGS@ \
@@ -18,8 +18,7 @@ AM_CPPFLAGS = \
18@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
19@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
20@ELEMENTARY_EMAP_CFLAGS@ \ 20@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ \ 21@ELEMENTARY_WAYLAND_CFLAGS@
22@EVIL_CFLAGS@
23 22
24if ELEMENTARY_WINDOWS_BUILD 23if ELEMENTARY_WINDOWS_BUILD
25AM_CPPFLAGS += -DELEMENTARY_BUILD 24AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -30,6 +29,6 @@ pkg_LTLIBRARIES = module.la
30 29
31module_la_SOURCES = mod.c 30module_la_SOURCES = mod.c
32 31
33module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ 32module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
34module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 33module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
35module_la_LIBTOOLFLAGS = --tag=disable-static 34module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index ddbc4cc18..3fe00e2b1 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
8-I$(top_srcdir) \ 8-I$(top_srcdir) \
9-I$(top_srcdir)/src/lib \ 9-I$(top_srcdir)/src/lib \
10-I$(top_builddir)/src/lib \ 10-I$(top_builddir)/src/lib \
11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 11-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
12-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 12-DPACKAGE_LIB_DIR=\"$(libdir)\" \
13@ELEMENTARY_CFLAGS@ \ 13@ELEMENTARY_CFLAGS@ \
14@ELEMENTARY_X_CFLAGS@ \ 14@ELEMENTARY_X_CFLAGS@ \
@@ -21,8 +21,7 @@ AM_CPPFLAGS = \
21@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
22@ELEMENTARY_WAYLAND_CFLAGS@ \ 22@ELEMENTARY_WAYLAND_CFLAGS@ \
23@ELEMENTARY_EMAP_CFLAGS@ \ 23@ELEMENTARY_EMAP_CFLAGS@ \
24@ELEMENTARY_DRM_CFLAGS@ \ 24@ELEMENTARY_DRM_CFLAGS@
25@EVIL_CFLAGS@
26 25
27if ELEMENTARY_WINDOWS_BUILD 26if ELEMENTARY_WINDOWS_BUILD
28AM_CPPFLAGS += -DELEMENTARY_BUILD 27AM_CPPFLAGS += -DELEMENTARY_BUILD
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 023ddf4e2..d53f1d2e7 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -19,8 +19,8 @@ AM_CPPFLAGS = \
19-I$(top_srcdir) \ 19-I$(top_srcdir) \
20-I$(top_srcdir)/src/lib \ 20-I$(top_srcdir)/src/lib \
21-I$(top_builddir)/src/lib \ 21-I$(top_builddir)/src/lib \
22-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 22-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
23-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 23-DLOCALE_DIR=\"$(localedir)\" \
24-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 24-DPACKAGE_LIB_DIR=\"$(libdir)\" \
25@ELEMENTARY_CFLAGS@ \ 25@ELEMENTARY_CFLAGS@ \
26@ELEMENTARY_X_CFLAGS@ \ 26@ELEMENTARY_X_CFLAGS@ \
@@ -30,8 +30,7 @@ AM_CPPFLAGS = \
30@ELEMENTARY_ELOCATION_CFLAGS@ \ 30@ELEMENTARY_ELOCATION_CFLAGS@ \
31@ELEMENTARY_WEB_CFLAGS@ \ 31@ELEMENTARY_WEB_CFLAGS@ \
32@ELEMENTARY_EMAP_CFLAGS@ \ 32@ELEMENTARY_EMAP_CFLAGS@ \
33@ELEMENTARY_WAYLAND_CFLAGS@ \ 33@ELEMENTARY_WAYLAND_CFLAGS@
34@EVIL_CFLAGS@
35 34
36if ELEMENTARY_WINDOWS_BUILD 35if ELEMENTARY_WINDOWS_BUILD
37AM_CPPFLAGS += -DELEMENTARY_BUILD 36AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -59,7 +58,7 @@ elm_horizontal_box.c \
59elm_vertical_frame.c \ 58elm_vertical_frame.c \
60elm_horizontal_frame.c 59elm_horizontal_frame.c
61 60
62module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ 61module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
63module_la_LDFLAGS = -no-undefined -module -avoid-version 62module_la_LDFLAGS = -no-undefined -module -avoid-version
64module_la_LIBTOOLFLAGS = --tag=disable-static 63module_la_LIBTOOLFLAGS = --tag=disable-static
65 64
diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index 7eec5a94b..bf191b8ab 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir) \ 7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib \ 8-I$(top_srcdir)/src/lib \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12@ELEMENTARY_CFLAGS@ \ 12@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 13@ELEMENTARY_X_CFLAGS@ \
@@ -18,8 +18,7 @@ AM_CPPFLAGS = \
18@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
19@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
20@ELEMENTARY_EMAP_CFLAGS@ \ 20@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ \ 21@ELEMENTARY_WAYLAND_CFLAGS@
22@EVIL_CFLAGS@
23 22
24if ELEMENTARY_WINDOWS_BUILD 23if ELEMENTARY_WINDOWS_BUILD
25AM_CPPFLAGS += -DELEMENTARY_BUILD 24AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -30,6 +29,6 @@ pkg_LTLIBRARIES = module.la
30 29
31module_la_SOURCES = mod.c 30module_la_SOURCES = mod.c
32 31
33module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ 32module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
34module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 33module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
35module_la_LIBTOOLFLAGS = --tag=disable-static 34module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index 6d2565991..260cd59f3 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir) \ 7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib \ 8-I$(top_srcdir)/src/lib \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12@ELEMENTARY_CFLAGS@ \ 12@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 13@ELEMENTARY_X_CFLAGS@ \
@@ -18,8 +18,7 @@ AM_CPPFLAGS = \
18@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
19@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
20@ELEMENTARY_EMAP_CFLAGS@ \ 20@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ \ 21@ELEMENTARY_WAYLAND_CFLAGS@
22@EVIL_CFLAGS@
23 22
24if ELEMENTARY_WINDOWS_BUILD 23if ELEMENTARY_WINDOWS_BUILD
25AM_CPPFLAGS += -DELEMENTARY_BUILD 24AM_CPPFLAGS += -DELEMENTARY_BUILD
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 4766a3134..6c97ce634 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -88,8 +88,7 @@ elm_suite_CPPFLAGS = \
88 @ELEMENTARY_EWEATHER_CFLAGS@ \ 88 @ELEMENTARY_EWEATHER_CFLAGS@ \
89 @ELEMENTARY_WEB_CFLAGS@ \ 89 @ELEMENTARY_WEB_CFLAGS@ \
90 @ELEMENTARY_EMAP_CFLAGS@ \ 90 @ELEMENTARY_EMAP_CFLAGS@ \
91 @ELEMENTARY_WAYLAND_CFLAGS@ \ 91 @ELEMENTARY_WAYLAND_CFLAGS@
92 @EVIL_CFLAGS@
93 92
94elm_suite_LDADD = \ 93elm_suite_LDADD = \
95 $(top_builddir)/src/lib/libelementary.la \ 94 $(top_builddir)/src/lib/libelementary.la \
@@ -121,8 +120,7 @@ elm_cxx_suite_CPPFLAGS = \
121 @ELEMENTARY_EWEATHER_CFLAGS@ \ 120 @ELEMENTARY_EWEATHER_CFLAGS@ \
122 @ELEMENTARY_WEB_CFLAGS@ \ 121 @ELEMENTARY_WEB_CFLAGS@ \
123 @ELEMENTARY_EMAP_CFLAGS@ \ 122 @ELEMENTARY_EMAP_CFLAGS@ \
124 @ELEMENTARY_WAYLAND_CFLAGS@ \ 123 @ELEMENTARY_WAYLAND_CFLAGS@
125 @EVIL_CFLAGS@
126 124
127elm_cxx_suite_LDADD = \ 125elm_cxx_suite_LDADD = \
128 $(top_builddir)/src/lib/libelementary.la \ 126 $(top_builddir)/src/lib/libelementary.la \