Merge branch 'devel/master(1.1.1)' into tizen

[platform/core/uifw/dali-adaptor.git] / build / tizen / configure.ac

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 0270fe1..de9034c 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014 Samsung Electronics Co., Ltd.
+# Copyright (c) 2015 Samsung Electronics Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ PKG_CHECK_MODULES(FRIBIDI, fribidi)
 PKG_CHECK_MODULES(TTRACE,  ttrace, AC_DEFINE(ENABLE_TTRACE, 1, [ttrace available]),
                   [ AC_MSG_NOTICE([Tizen Trace not avaiable]) ]
                   )
+PKG_CHECK_MODULES(ECORE_IMF, [ecore-imf >= 1.13], [ecore_imf_1_13=yes], [ecore_imf_1_13=no])
 
 
 # Check for EldBus.h in ECore
@@ -66,34 +67,12 @@ fi
 AC_SUBST(DALI_ELDBUS_AVAILABLE)
 
 
-PKG_CHECK_EXISTS(bullet, [
-  BULLET_CFLAGS=`pkg-config --cflags bullet`
-  BULLET_LIBS=`pkg-config --libs bullet`
-  BULLET=yes
-], [
-  AC_MSG_WARN([BulletPhysics development files not found, not building bullet plugin])
-  BULLET_CFLAGS=
-  BULLET_LIBS=
-  BULLET=no
-])
-
-AC_SUBST(BULLET_CFLAGS)
-AC_SUBST(BULLET_LIBS)
-
-AC_ARG_ENABLE([bullet],
-              [AC_HELP_STRING([ --enable-bullet],
-                              [Enable bullet plugin])],
-              [enable_bullet=yes],
-              [enable_bullet=no])
-
-
 AC_ARG_ENABLE([feedback],
               [AC_HELP_STRING([ --enable-feedback],
                               [Enable feedback plugin])],
               [enable_feedback=yes],
               [enable_feedback=no])
 
-AM_CONDITIONAL([USE_BULLET], [test x$BULLET = xyes && test x$enable_bullet = xyes])
 AM_CONDITIONAL([USE_FEEDBACK], [test x$enable_feedback = xyes])
 
 DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DPLATFORM_TIZEN"
@@ -128,6 +107,11 @@ if test "x$enable_shaderbincache" = "xENABLE"; then
   DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DSHADERBIN_CACHE_ENABLED"
 fi
 
+# If Ecore IMF version is greater than 1.13, then some structures are different
+if test "x$ecore_imf_1_13" = "xyes"; then
+  DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DECORE_IMF_1_13"
+fi
+
 AC_ARG_ENABLE([gles],
               [AC_HELP_STRING([--enable-gles],
                               [Specify the OpenGL ES version for backwards compatibility])],
@@ -270,9 +254,9 @@ AC_CONFIG_FILES([
  adaptor/dali-adaptor-integration.pc
 ])
 
-AM_CONDITIONAL([USE_PLUGIN], [test x$enable_feedback = xyes || test x$enable_bullet = xyes])
+AM_CONDITIONAL([USE_PLUGIN], [test x$enable_feedback = xyes])
 
-if test "x$enable_feedback" = "xyes" || test "x$enable_bullet" = "xyes"; then
+if test "x$enable_feedback" = "xyes"; then
 AC_CONFIG_FILES([
  plugins/Makefile
 ])
@@ -297,7 +281,9 @@ Configuration
   Data Dir (Read Only):             $dataReadOnlyDir
   OVERTIZEN2.2:                     $with_over_tizen_2_2
   EldBus:                           $eldbus_available
+  Shader Binary Cache:              $enable_shaderbincache
   Build for Node.JS (LibUV)         $build_for_node_js
+  Ecore Version At Least 1.13.0     $ecore_imf_1_13
 "
 # optional output of node.js source path if we're building for node.js
 if test "x$build_for_node_js" != "xno"; then