Merge branch 'devel/master' into devel/new_mesh

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

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index d760e20..7cee705 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -118,12 +118,6 @@ if test "x$enable_shaderbincache" = "xENABLE"; then
   DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DSHADERBIN_CACHE_ENABLED"
 fi
 
-AC_ARG_ENABLE([assimp],
-              [AC_HELP_STRING([--enable-assimp],
-                              [Enable assimp plugin, overriding platform defaults])],
-              [enable_assimp=yes],
-              [enable_assimp=no])
-
 AC_ARG_ENABLE([gles],
               [AC_HELP_STRING([--enable-gles],
                               [Specify the OpenGL ES version for backwards compatibility])],
@@ -132,14 +126,6 @@ AC_ARG_ENABLE([gles],
 
 DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DDALI_GLES_VERSION=${enable_gles}"
 
-AC_ARG_WITH([jpeg-turbo],
-            [AC_HELP_STRING([--with-jpeg-turbo],
-                            [Use the JPEG Turbo library])],
-            [with_jpeg_turbo=$withval],
-            [with_jpeg_turbo=yes])
-
-AM_CONDITIONAL(TURBO_JPEG_IS_ON, test $with_jpeg_turbo = yes)
-
 AC_ARG_WITH([over-tizen_2_2],
             [AC_HELP_STRING([--with-over-tizen_2_2],
                             [Use tizen API over ver. 2.2])],
@@ -219,14 +205,6 @@ PKG_CHECK_MODULES(FEEDBACK, feedback)
 PKG_CHECK_MODULES(MMFSOUND, mm-sound)
 fi
 
-if test "x$enable_assimp" = "xyes" ; then
-  PKG_CHECK_MODULES(ASSIMP, assimp)
-  ASSIMP_CFLAGS+=-DASSIMP_ENABLED
-fi
-
-# Don't move this - it depends on the platform defaults above
-AM_CONDITIONAL([ASSIMP_ENABLED], [test x$enable_assimp = xyes])
-
 if test x$DALI_DATA_RW_DIR != x; then
   dataReadWriteDir=$DALI_DATA_RW_DIR
 else
@@ -277,8 +255,6 @@ Configuration
   Prefix:                           $prefix
   Debug Build:                      $enable_debug
   Compile flags                     $DALI_ADAPTOR_CFLAGS
-  Using Assimp Library:             $enable_assimp
-  Using JPEG Turbo Library:         $with_jpeg_turbo
   Freetype bitmap support (Emoji):  $freetype_bitmap_support
   Profile:                          $enable_profile
   Data Dir (Read/Write):            $dataReadWriteDir