X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2Fconfigure.ac;h=2bd1a7cc68df6df3e049dc5cb5067b7ecf861cf4;hb=f26a828765b20d4d53a8b899b127cc75bab9f9ff;hp=2e5000c1fe6369a6c9c3247ba6066336ba37d582;hpb=a5198d16a8e08b5a7b0e88c736ba12b0e0d258c8;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index 2e5000c..2bd1a7c 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -35,7 +35,6 @@ FREETYPE_REQUIRED=9.16.3 # 17.1.11 = Freetype version 2.5.2 FREETYPE_BITMAP_SUPPORT_VERSION=17.1.11 -PKG_CHECK_MODULES(DALICORE, dali-core) PKG_CHECK_MODULES(EXIF, libexif) PKG_CHECK_MODULES(FREETYPE, [freetype2 >= $FREETYPE_REQUIRED]) PKG_CHECK_MODULES(FREETYPE_BITMAP_SUPPORT, [freetype2 >= $FREETYPE_BITMAP_SUPPORT_VERSION], [ freetype_bitmap_support=yes ], [ freetype_bitmap_support=no ] ) @@ -67,7 +66,11 @@ 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 " @@ -171,6 +174,18 @@ AC_ARG_ENABLE(wayland, enable_wayland=yes, enable_wayland=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])], + [enable_rename_so=$enableval], + [enable_rename_so=yes]) + DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DDALI_PROFILE_${enable_profile}" DALI_PROFILE_CFLAGS=" -DDALI_PROFILE_${enable_profile}" AM_CONDITIONAL([COMMON_PROFILE], [test x$enable_profile = xCOMMON]) @@ -182,6 +197,8 @@ AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU]) AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = 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 AM_CONDITIONAL([ENABLE_VECTOR_BASED_TEXT_RENDERING], [test x$enable_profile = xUBUNTU]) @@ -205,6 +222,12 @@ 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) PKG_CHECK_MODULES(SCREENCONNECTORPROVIDER, screen_connector_provider) @@ -228,6 +251,10 @@ 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) @@ -316,11 +343,13 @@ AC_SUBST(tizenPlatformConfigSupported) devincludepath=${includedir} AC_SUBST(devincludepath) -AC_CONFIG_FILES([ - Makefile - dali-adaptor.pc - dali-adaptor-integration.pc -]) +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 if test "x$freetype_bitmap_support" = "xyes"; then DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DFREETYPE_BITMAP_SUPPORT"