X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Ftizen%2Fconfigure.ac;h=24d2a9ecb38e2792c95092e899dcdb0019819cab;hp=40bdf2759c461657798ebbf8cc6ba7d87c830566;hb=ffd1ab3de4e5ab0056687047f6117f8b81c042f8;hpb=74a038e7b56576fe2bcb6a4e70c1aa361f681b09 diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index 40bdf27..24d2a9e 100755 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -1,5 +1,5 @@ # -# Copyright (c) 2016 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. @@ -74,25 +74,14 @@ AC_ARG_ENABLE([csharp], [enable_csharp=$enableval], [enable_csharp=automatic]) -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]) -AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes]) AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes]) -if test "x$enable_cxx03_abi" = "xyes"; then - DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" -fi - if test "x$enable_debug" = "xyes"; then DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDEBUG_ENABLED" fi @@ -195,13 +184,8 @@ DOXYGEN_ROOT_DIR=../../.. AC_SUBST(DOXYGEN_DOCS_DIR) AC_SUBST(DOXYGEN_ROOT_DIR) -if test "x$enable_cxx03_abi" = "xyes"; then -PKG_CHECK_MODULES(DALI, dali-core-cxx03) -PKG_CHECK_MODULES(DALIDAPTOR, dali-adaptor-cxx03) -else PKG_CHECK_MODULES(DALICORE, dali-core) PKG_CHECK_MODULES(DALIADAPTOR, dali-adaptor) -fi # Enable csharp plugin build_csharp_plugin=no @@ -244,12 +228,9 @@ AC_CONFIG_FILES([ docs/dali.doxy docs-internal/dali-internal.doxy ../../automated-tests/CMakeLists.txt + dali-toolkit.pc ]) -if test "x$enable_cxx03_abi" = "xno"; then -AC_CONFIG_FILES([dali-toolkit.pc]) -fi - AC_OUTPUT echo "