projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change dependency
[platform/core/uifw/dali-toolkit.git]
/
build
/
tizen
/
configure.ac
diff --git
a/build/tizen/configure.ac
b/build/tizen/configure.ac
index
96c78cd
..
40bdf27
100755
(executable)
--- 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)
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 ...)
# 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
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
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])
#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])