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
Merge remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
build
/
tizen
/
configure.ac
diff --git
a/build/tizen/configure.ac
b/build/tizen/configure.ac
index
454053f
..
1d45d73
100644
(file)
--- a/
build/tizen/configure.ac
+++ b/
build/tizen/configure.ac
@@
-30,7
+30,6
@@
AC_SUBST(DALI_TOOLKIT_VERSION)
PKG_CHECK_MODULES(DALICORE, dali-core)
PKG_CHECK_MODULES(DALI, dali)
PKG_CHECK_MODULES(DALICORE, dali-core)
PKG_CHECK_MODULES(DALI, dali)
-PKG_CHECK_MODULES(FRIBIDI, fribidi)
DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
@@
-46,14
+45,27
@@
AC_ARG_ENABLE([debug],
[enable_debug=$enableval],
[enable_debug=no])
[enable_debug=$enableval],
[enable_debug=no])
+# option for JavaScript plugin
+AC_ARG_ENABLE(javascript,
+ [AC_HELP_STRING([--enable-javascript],
+ [Enable JavaScript plugin])] ,
+ [enable_javascript=yes],
+ [enable_javascript=no])
+
if test "x$enable_debug" = "xyes"; then
DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDEBUG_ENABLED"
if test "x$enable_debug" = "xyes"; then
DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDEBUG_ENABLED"
+ DALI_SCRIPTV8_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDEBUG_ENABLED"
fi
if test "x$enable_debug" = "xno" -a "x$enable_exportall" = "xno"; then
DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -fvisibility=hidden -DHIDE_DALI_INTERNALS"
fi
if test "x$enable_debug" = "xno" -a "x$enable_exportall" = "xno"; then
DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -fvisibility=hidden -DHIDE_DALI_INTERNALS"
+ DALI_SCRIPTV8_CFLAGS="$DALI_TOOLKIT_CFLAGS -fvisibility=hidden -DHIDE_DALI_INTERNALS"
fi
fi
+#set a variable for the makefile to conditionally compile the plugin
+AM_CONDITIONAL([ENABLE_JAVASCRIPT_PLUGIN], [test x$enable_javascript = xyes])
+
+
# Tizen Profile options
AC_ARG_ENABLE([profile],
[AC_HELP_STRING([--enable-profile=COMMON,MOBILE,LITE,WEARABLE,TV],
# Tizen Profile options
AC_ARG_ENABLE([profile],
[AC_HELP_STRING([--enable-profile=COMMON,MOBILE,LITE,WEARABLE,TV],
@@
-61,10
+73,6
@@
AC_ARG_ENABLE([profile],
[dali_profile=$enableval],
[dali_profile=COMMON])
[dali_profile=$enableval],
[dali_profile=COMMON])
-# Different platforms use either the full Toolkit or the basic version
-# The basic version excludes components under dali-toolkit/optional
-AM_CONDITIONAL([TOOLKIT_BASIC_VERSION], [test x$dali_profile = xLITE])
-
if test x$DALI_DATA_RW_DIR != x; then
dataReadWriteDir=${DALI_DATA_RW_DIR}/
else
if test x$DALI_DATA_RW_DIR != x; then
dataReadWriteDir=${DALI_DATA_RW_DIR}/
else
@@
-80,6
+88,8
@@
fi
AC_SUBST(dataReadWriteDir)
AC_SUBST(dataReadOnlyDir)
AC_SUBST(DALI_TOOLKIT_CFLAGS)
AC_SUBST(dataReadWriteDir)
AC_SUBST(dataReadOnlyDir)
AC_SUBST(DALI_TOOLKIT_CFLAGS)
+AC_SUBST(DALI_SCRIPTV8_CFLAGS)
+AC_SUBST(DALI_SCRIPTV8_LIBS)
# Specify the include directory for development headers
#devincludepath=${includedir}/dali/internal
# Specify the include directory for development headers
#devincludepath=${includedir}/dali/internal
@@
-95,6
+105,7
@@
AC_SUBST(DOXYGEN_ROOT_DIR)
AC_CONFIG_FILES([
Makefile
dali-toolkit/Makefile
AC_CONFIG_FILES([
Makefile
dali-toolkit/Makefile
+ plugins/Makefile
dali-toolkit.pc
docs/Makefile
docs/dali.doxy
dali-toolkit.pc
docs/Makefile
docs/dali.doxy
@@
-107,6
+118,7
@@
Configuration
-------------
Prefix: $prefix
Debug Build: $enable_debug
-------------
Prefix: $prefix
Debug Build: $enable_debug
+ JavaScript support (V8 required) $enable_javascript
Profile: $dali_profile
Data Dir (Read/Write): $dataReadWriteDir
Data Dir (Read Only): $dataReadOnlyDir
Profile: $dali_profile
Data Dir (Read/Write): $dataReadWriteDir
Data Dir (Read Only): $dataReadOnlyDir