X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2Fconfigure.ac;h=a2a542bf002525cf7349ab3ef9a1b28d14ee5f9b;hb=55e0d8e7cd3c4dba8fbc3bdab65da53281bf287d;hp=11a68161c6e707610149a508c5a2131f369b31eb;hpb=3b0387df2e30a60ba820bd77f2fc89a2a8bc579d;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index 11a6816..a2a542b 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Samsung Electronics Co., Ltd. +# Copyright (c) 2019 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. @@ -47,6 +47,7 @@ PKG_CHECK_MODULES(LIBCURL, libcurl) PKG_CHECK_MODULES(LIBCRYPTO, libcrypto) PKG_CHECK_MODULES(HARFBUZZ, harfbuzz) PKG_CHECK_MODULES(FRIBIDI, fribidi) +PKG_CHECK_MODULES(CAIRO, cairo) PKG_CHECK_MODULES(EVAS, evas) PKG_CHECK_MODULES(TTRACE, ttrace, AC_DEFINE(ENABLE_TTRACE, 1, [ttrace available]), [ AC_MSG_NOTICE([Tizen Trace not avaiable]) ] @@ -68,11 +69,7 @@ fi AC_SUBST(DALI_ELDBUS_AVAILABLE) -if test "x$enable_cxx03_abi" = "xyes"; then -PKG_CHECK_MODULES(TPKP_CURL, tpkp-curl-deprecated, [ tpkp_curl_available=yes ], [ tpkp_curl_available=no ] ) -else PKG_CHECK_MODULES(TPKP_CURL, tpkp-curl, [ tpkp_curl_available=yes ], [ tpkp_curl_available=no ] ) -fi if test "x$tpkp_curl_available" = "xyes"; then DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DTPK_CURL_ENABLED " @@ -132,14 +129,6 @@ 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])], - [enable_gles=$enableval], - [enable_gles=30]) - -DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DDALI_GLES_VERSION=${enable_gles}" - # Currently, dali-adaptor requires appfw on Tizen # and does not require it on Ubuntu. # So we should be able to enable/disable this option for dali-adaptor. @@ -149,13 +138,6 @@ AC_ARG_ENABLE([appfw], [enable_appfw=$enableval], [enable_appfw=no]) -# Option to allow building with Tizen SDK 2.2 -AC_ARG_WITH([tizen-2-2-compatibility], - [AC_HELP_STRING([--with-tizen-2-2-compatibility], - [Use Tizen SDK 2.2 compatibility])], - [with_tizen_2_2_compatibility=$withval], - [with_tizen_2_2_compatibility=no]) - # Tizen Profile options AC_ARG_ENABLE([profile], [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,IVI,UBUNTU], @@ -185,12 +167,6 @@ AC_ARG_ENABLE(ecore_wayland2, enable_ecore_wayland2=yes, enable_ecore_wayland2=no) -AC_ARG_ENABLE([cxx03_abi], - [AC_HELP_STRING([--enable-cxx03-abi], - [Specify abi for the build])], - [enable_cxx03_abi=$enableval], - [enable_cxx03_abi=no]) - AC_ARG_ENABLE([rename_so], [AC_HELP_STRING([--enable-rename-so], [Specify whether so file is renamed or not])], @@ -208,8 +184,6 @@ AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU]) AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes]) AM_CONDITIONAL([ECORE_WAYLAND2], [test x$enable_ecore_wayland2 = xyes]) AM_CONDITIONAL([USE_APPFW], [test x$enable_appfw = xyes]) -AM_CONDITIONAL([USE_APPFW_EFL_BASE], [test x$enable_tizen_major_version = x3]) -AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes]) AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes]) # Platforms with highp shader support can use vector based text @@ -236,11 +210,7 @@ if test "x$enable_profile" = "xLITE"; then PKG_CHECK_MODULES(OPENGLES20, gles20) fi -if test "x$enable_cxx03_abi" = "xyes"; then -PKG_CHECK_MODULES(DALICORE, dali-core-cxx03) -else PKG_CHECK_MODULES(DALICORE, dali-core) -fi if test "x$enable_profile" = "xWEARABLE"; then PKG_CHECK_MODULES(OPENGLES20, glesv2) @@ -265,15 +235,9 @@ if test "x$enable_profile" = "xUBUNTU"; then PKG_CHECK_MODULES(OPENGLES20, glesv2 egl) else -if test "x$enable_cxx03_abi" = "xyes"; then - DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" -fi - PKG_CHECK_MODULES(DLOG, dlog) PKG_CHECK_MODULES(TTS, tts) PKG_CHECK_MODULES(VCONF, vconf) - -if test "x$with_tizen_2_2_compatibility" = "xno"; then PKG_CHECK_MODULES(CAPI_SYSTEM_INFO, capi-system-info) PKG_CHECK_MODULES(CAPI_SYSTEM_SENSOR, capi-system-sensor, [ capi_system_sensor_support=yes ], [ capi_system_sensor_support=no ] ) @@ -281,8 +245,6 @@ if test "x$capi_system_sensor_support" = "xyes"; then DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DCAPI_SYSTEM_SENSOR_SUPPORT" fi -fi - fi # ubuntu profile test if test "x$enable_appfw" = "xyes"; then @@ -362,13 +324,11 @@ AC_SUBST(tizenPlatformConfigSupported) devincludepath=${includedir} AC_SUBST(devincludepath) -AC_CONFIG_FILES([Makefile]) - -if test "x$enable_cxx03_abi" = "xyes"; then -AC_CONFIG_FILES([dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc]) -else -AC_CONFIG_FILES([dali-adaptor.pc dali-adaptor-integration.pc]) -fi +AC_CONFIG_FILES([ + Makefile + dali-adaptor.pc + dali-adaptor-integration.pc +]) if test "x$freetype_bitmap_support" = "xyes"; then DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DFREETYPE_BITMAP_SUPPORT" @@ -388,13 +348,11 @@ Configuration Profile: $enable_profile Data Dir (Read/Write): $dataReadWriteDir Data Dir (Read Only): $dataReadOnlyDir - Tizen SDK 2.2 compatibility: $with_tizen_2_2_compatibility EldBus: $eldbus_available Shader Binary Cache: $enable_shaderbincache Ecore Version At Least 1.13.0 $ecore_imf_1_13 Network logging enabled: $enable_networklogging Font config file: $fontConfigurationFile Using Tizen APP FW libraries: $enable_appfw - OpenGL ES version: $enable_gles Tizen Platform Config supported $tizenPlatformConfigSupported "