X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Ftizen%2Fconfigure.ac;h=40bdf2759c461657798ebbf8cc6ba7d87c830566;hp=96c78cd8df9ed07ea0faf3e0b12ca6fe9e9fc92b;hb=a51b07008f653527f99b2f982cfe3f81e42a0a64;hpb=63ca57aca66eafc6b4daaac7c60fcad31e598804 diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index 96c78cd..40bdf27 100755 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -195,14 +195,20 @@ 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 build_ruby_flag=no if test x$enable_csharp = xyes; then [build_csharp_plugin=yes] AC_MSG_NOTICE(Building DALi csharp plugin ...) - - PKG_CHECK_MODULES(DALIADAPTOR, dali-adaptor) AC_PATH_PROG([SWIG], [swig]) # if gbs enable, then only use swig, without ruby or mcs @@ -225,12 +231,6 @@ if test x$enable_csharp = xyes; then AC_SUBST(DALITOOLKIT_LIBS) fi -if test "x$enable_cxx03_abi" = "xyes"; then -PKG_CHECK_MODULES(DALICORE, dali-core-cxx03) -else -PKG_CHECK_MODULES(DALICORE, dali-core) -fi - #set a variable for the makefile to force compile the csharp plugin AM_CONDITIONAL([ENABLE_CSHARP_PLUGIN], [test x$build_csharp_plugin = xyes]) AM_CONDITIONAL([ENABLE_RUBY_FLAG], [test x$build_ruby_flag = xyes])