summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSavio Sena <savio@expertisesolutions.com.br>2014-05-09 17:51:39 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-07-21 20:53:12 -0300
commitcd4d2867242c31c1fec2dfb56187c28710b2bb81 (patch)
treecdc81c0bc2b786fa489175a716d074b8e6906446 /configure.ac
parent8ef9f49e9493b40995ab1028c95c9d6c149aca68 (diff)
autotools: Add eolian-cxx to elementary.
Conflicts: src/lib/Makefile.am
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac38
1 files changed, 36 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index a3948e7f5..a2553e276 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,7 @@ AC_PROG_CC_STDC
112AC_HEADER_STDC 112AC_HEADER_STDC
113AC_C_CONST 113AC_C_CONST
114AC_FUNC_ALLOCA 114AC_FUNC_ALLOCA
115AC_PROG_CXX
115 116
116ELM_VERSION_MAJOR="v_maj" 117ELM_VERSION_MAJOR="v_maj"
117ELM_VERSION_MINOR="v_min" 118ELM_VERSION_MINOR="v_min"
@@ -224,6 +225,33 @@ requirement_elm="\
224 eio >= efl_version \ 225 eio >= efl_version \
225 " 226 "
226 227
228EFL_CXX_COMPILE_STDCXX_11([ext])
229want_cxx11="yes"
230AC_ARG_ENABLE([c++11],
231 [AC_HELP_STRING([--disable-c++11],
232 [disable C++11 bindings. @<:@default=enabled@:>@])],
233 [want_cxx11="${enableval}"])
234
235if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then
236 PKG_CHECK_MODULES([ELEMENTARY_CXX],
237 [
238 eo-cxx >= efl_version
239 eina-cxx >= efl_version
240 evas-cxx >= efl_version
241 ],
242 [
243 requirement_elm="${requirement_elm} \
244 eo-cxx >= efl_version \
245 eina-cxx >= efl_version \
246 evas-cxx >= efl_version \
247 "
248 have_cxx11="yes"
249 ],
250 [have_cxx11="no"]
251 )
252fi
253AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" = "xyes"])
254
227have_elementary_x="no" 255have_elementary_x="no"
228want_elementary_x="auto" 256want_elementary_x="auto"
229AC_ARG_ENABLE([ecore-x], 257AC_ARG_ENABLE([ecore-x],
@@ -527,7 +555,7 @@ if test "x$want_elementary_web" != "xnone"; then
527 "$webkit_datadir", 555 "$webkit_datadir",
528 "WebKit's data dir") 556 "WebKit's data dir")
529 ELM_WEB2_DEF="#define" 557 ELM_WEB2_DEF="#define"
530 558o
531 elementary_web=$want_elementary_web 559 elementary_web=$want_elementary_web
532 requirement_elm="${want_elementary_web} ${requirement_elm}" 560 requirement_elm="${want_elementary_web} ${requirement_elm}"
533 ], 561 ],
@@ -590,13 +618,16 @@ my_libs="-lm"
590AC_SUBST(my_libs) 618AC_SUBST(my_libs)
591AC_SUBST(requirement_elm) 619AC_SUBST(requirement_elm)
592 620
621
593EFL_WITH_BIN([eet], [eet-eet], [eet]) 622EFL_WITH_BIN([eet], [eet-eet], [eet])
594EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) 623EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
595EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen]) 624EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen])
596EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc]) 625EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc])
597EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen]) 626EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen])
598# Force the helper to try external eolian-gen 627EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx])
628# Force the helper to try external eolian generators
599AM_CONDITIONAL(HAVE_EOLIAN_GEN, [true]) 629AM_CONDITIONAL(HAVE_EOLIAN_GEN, [true])
630AM_CONDITIONAL(HAVE_EOLIAN_CXX, [true])
600 631
601EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) 632EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
602 633
@@ -725,6 +756,7 @@ echo " edje_cc..................: ${edje_cc}"
725echo " elementary_codegen.......: ${elementary_codegen}" 756echo " elementary_codegen.......: ${elementary_codegen}"
726echo " elm_prefs_cc.............: ${elm_prefs_cc}" 757echo " elm_prefs_cc.............: ${elm_prefs_cc}"
727echo " eolian_gen...............: ${eolian_gen}" 758echo " eolian_gen...............: ${eolian_gen}"
759echo " eolian_cxx...............: ${eolian_cxx}"
728echo 760echo
729echo " Build elementary_test....: ${have_elementary_test}" 761echo " Build elementary_test....: ${have_elementary_test}"
730echo " Build elementary_codegen.: ${have_elementary_codegen}" 762echo " Build elementary_codegen.: ${have_elementary_codegen}"
@@ -733,10 +765,12 @@ echo " Examples.................: ${enable_build_examples}"
733echo " Examples installed.......: ${enable_install_examples}" 765echo " Examples installed.......: ${enable_install_examples}"
734echo " Build elementary_config..: ${have_elementary_config}" 766echo " Build elementary_config..: ${have_elementary_config}"
735echo " Enable debug.............: ${want_elementary_debug}" 767echo " Enable debug.............: ${want_elementary_debug}"
768echo " Enable C++...............: ${have_cxx11}"
736echo 769echo
737echo "Compilation................: make (or gmake)" 770echo "Compilation................: make (or gmake)"
738echo " CPPFLAGS.................: $CPPFLAGS" 771echo " CPPFLAGS.................: $CPPFLAGS"
739echo " CFLAGS...................: $CFLAGS" 772echo " CFLAGS...................: $CFLAGS"
773echo " CXXFLAGS.................: $CXXFLAGS"
740echo " LDFLAGS..................: $LDFLAGS" 774echo " LDFLAGS..................: $LDFLAGS"
741echo 775echo
742if test "${build_tests}" = "none"; then 776if test "${build_tests}" = "none"; then