X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2Fconfigure.ac;h=2dedcbef349fdf07ce347097334579fc80aa1d35;hb=94544683debb6c663293c39eac5e091f27e1a4e7;hp=a2a542bf002525cf7349ab3ef9a1b28d14ee5f9b;hpb=7a617290178f8db8f691550fbb7bc7620e843a9d;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index a2a542b..2dedcbe 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -58,8 +58,8 @@ PKG_CHECK_MODULES(TTRACE, ttrace, AC_DEFINE(ENABLE_TTRACE, 1, [ttrace available PKG_CHECK_MODULES(ECORE, ecore) PKG_CHECK_MODULES(ECORE_IPC, ecore-ipc) 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 -PKG_CHECK_MODULES(ELDBUS, eldbus, [ eldbus_available=yes ], [ eldbus_available=no ] ) +# Check for EldBus.h in ECore, required for ATSPI +PKG_CHECK_MODULES(ELDBUS, eldbus, [ eldbus_available=yes ]) DALI_ELDBUS_AVAILABLE= if test "x$eldbus_available" = "xyes"; then @@ -71,6 +71,13 @@ AC_SUBST(DALI_ELDBUS_AVAILABLE) PKG_CHECK_MODULES(TPKP_CURL, tpkp-curl, [ tpkp_curl_available=yes ], [ tpkp_curl_available=no ] ) +if test "x$enable_tizen_major_version" = "x5"; then +if test "x$enable_tizen_minor_version" = "x5"; then +PKG_CHECK_MODULES(AUTOFILL, capi-ui-autofill) + DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DCAPI_AUTOFILL_SUPPORT" +fi +fi + if test "x$tpkp_curl_available" = "xyes"; then DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DTPK_CURL_ENABLED " fi @@ -152,6 +159,13 @@ AC_ARG_ENABLE([tizen-major-version], [enable-tizen-major-version=$enableval], [enable-tizen-major-version=0]) +# Tizen Minor version +AC_ARG_ENABLE([tizen-minor-version], + [AC_HELP_STRING([--enable-tizen-minor-version], + [Specify the Tizen Minor version for backwards compatibility])], + [enable-tizen-minor-version=$enableval], + [enable-tizen-minor-version=0]) + # Ensure valid profile selected if test "x$enable_profile" != "xCOMMON" -a "x$enable_profile" != "xMOBILE" -a "x$enable_profile" != "xWEARABLE" -a "x$enable_profile" != "xTV" -a "x$enable_profile" != "xIVI" -a "x$enable_profile" != "xUBUNTU"; then AC_MSG_ERROR([$enable_profile is an invalid profile]) @@ -312,6 +326,13 @@ if test x$FONT_CONFIGURATION_FILE != x; then fontConfigurationFile=$FONT_CONFIGURATION_FILE fi +if test "x$enable_profile" = "xUBUNTU"; then + cachePath=$HOME +else + cachePath="/home/owner" +fi # ubuntu profile test + +AC_SUBST(cachePath) AC_SUBST(dataReadWriteDir) AC_SUBST(dataReadOnlyDir) AC_SUBST(DALI_ADAPTOR_CFLAGS) @@ -328,6 +349,7 @@ AC_CONFIG_FILES([ Makefile dali-adaptor.pc dali-adaptor-integration.pc + ../../../dali/internal/adaptor/common/system-cache-path.cpp:./system-cache-path.in ]) if test "x$freetype_bitmap_support" = "xyes"; then