X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2Fconfigure.ac;h=77ded63f88fb575e5b8bce21a3a6f8fba6ecaa5e;hb=43ea5f0803fb8b30c7a65c78893837ff360c1cf5;hp=ca2eb43bfccbb01863939e849b585028d15a68de;hpb=c909ab6047694ab91c1aad35608db216c1940240;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index ca2eb43..77ded63 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -44,7 +44,6 @@ PKG_CHECK_MODULES(PNG, libpng) PKG_CHECK_MODULES(LIBEXIF, libexif) PKG_CHECK_MODULES(LIBDRM, libdrm) 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) @@ -71,13 +70,6 @@ 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 @@ -159,13 +151,6 @@ 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]) @@ -326,6 +311,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) @@ -342,6 +334,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