X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=f412863544c959004bec2e996f87d7318e6f2a5a;hb=HEAD;hp=72abf5a90d20bcceb28031176ce16711ffd2cae8;hpb=0b7ca811df6826246605de55ccce2aedbb859a86;p=platform%2Fupstream%2Felementary.git

diff --git a/configure.ac b/configure.ac
index 72abf5a..f412863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-EFL_VERSION([1], [13], [1], [release])
+EFL_VERSION([1], [16], [0], [release])
 AC_INIT([elementary], [efl_version], [enlightenment-devel@lists.sourceforge.net])
 
 AC_PREREQ(2.63)
@@ -31,10 +31,10 @@ EFL_INIT
 # C++ bindings
 
 AC_ARG_ENABLE([cxx-bindings],
-   [AS_HELP_STRING([--enable-cxx-bindings],
-       [enable C++11 bindings. @<:@default=disabled@:>@])],
+   [AS_HELP_STRING([--disable-cxx-bindings],
+       [Disable C++11 bindings. @<:@default=enabled@:>@])],
    [want_cxx11="${enableval}"],
-   [want_cxx11="no"])
+   [want_cxx11="yes"])
 
 # Tests
 
@@ -192,6 +192,7 @@ EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen])
 EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc])
 EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen])
 EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx])
+EFL_WITH_BIN([eldbus], [eldbus_codegen], [eldbus-codegen])
 # Force the helper to try external eolian generators
 AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true])
 AM_CONDITIONAL([HAVE_EOLIAN_CXX], [true])
@@ -269,6 +270,8 @@ if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then
         eo-cxx >= efl_version
         eina-cxx >= efl_version
         evas-cxx >= efl_version
+        eio-cxx >= efl_version
+        edje-cxx >= efl_version
       ],
       [
         requirement_elm_pc="${requirement_elm_pc} \
@@ -276,10 +279,13 @@ if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then
           eo-cxx >= efl_version \
           eina-cxx >= efl_version \
           evas-cxx >= efl_version \
+          eio-cxx >= efl_version \
+          edje-cxx >= efl_version \
         "
         have_cxx11="yes"
         LDFLAGS="${LDFLAGS} -fPIC -DPIC"
         CXXFLAGS="${CXXFLAGS} -fPIC -DPIC"
+        AC_CONFIG_FILES([src/lib/Elementary.hh])
       ],
       [have_cxx11="no"]
    )
@@ -334,13 +340,7 @@ dnl managed by evil
       have_dlopen="yes"
       requirement_elm_libs="-ldl ${requirement_elm_libs}"
       ;;
-   *solaris*)
-      have_dlopen="yes"
-      ;;
-   darwin*)
-      have_dlopen="yes"
-      ;;
-   *)
+   linux*)
       AC_CHECK_LIB([dl], [dlopen], [res=yes], [res=no])
       if test "x$res" = "xyes"; then
          AC_CHECK_LIB([dl], [dladdr], AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.]))
@@ -348,6 +348,9 @@ dnl managed by evil
          have_dlopen="yes"
       fi
       ;;
+   *)
+      have_dlopen="yes"
+      ;;
 esac
 
 AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"])
@@ -384,6 +387,14 @@ AM_CONDITIONAL([ELEMENTARY_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"])
 
 ### Checks for header files
 
+# Check for ttrace
+PKG_CHECK_MODULES(TTRACE,
+                  [ttrace],
+                  [have_ttrace="yes"], [have_ttrace="no"])
+if test "x$have_ttrace" = "xyes"; then
+  AC_DEFINE(ENABLE_TTRACE, 1, [ttrace available])
+fi
+
 ELM_ALLOCA_H_DEF="#undef"
 AC_CHECK_HEADER([alloca.h], [ELM_ALLOCA_H_DEF="#define"])
 AC_SUBST([ELM_ALLOCA_H_DEF])
@@ -444,7 +455,7 @@ ELM_QUICKLAUNCH
 
 AC_FUNC_ALLOCA
 
-AC_CHECK_FUNCS([geteuid getuid])
+AC_CHECK_FUNCS([geteuid getuid getpwent])
 
 if test "x${want_quicklaunch}" != "xno"; then
    AC_CHECK_FUNCS([fork clearenv])
@@ -495,12 +506,14 @@ src/bin/Makefile
 src/modules/Makefile
 src/modules/prefs/Makefile
 src/modules/access_output/Makefile
+src/modules/copypasteUI_ctxpopup/Makefile
 src/modules/datetime_input_ctxpopup/Makefile
 src/modules/test_entry/Makefile
 src/modules/test_map/Makefile
 src/edje_externals/Makefile
 src/examples/Makefile
 src/examples/sphere_hunter/Makefile
+src/examples/performance/Makefile
 src/tests/Makefile
 src/imported/Makefile
 src/imported/atspi/Makefile
@@ -559,6 +572,7 @@ echo "  elementary_codegen.......: ${elementary_codegen}"
 echo "  elm_prefs_cc.............: ${elm_prefs_cc}"
 echo "  eolian_gen...............: ${eolian_gen}"
 echo "  eolian_cxx...............: ${eolian_cxx}"
+echo "  eldbus_codegen...........: ${eldbus_codegen}"
 echo
 echo "  Build elementary_test....: ${have_elementary_test}"
 echo "  Build elementary_codegen.: ${have_elementary_codegen}"