Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
PolyORB-HI-C
Commits
17bd61d2
Commit
17bd61d2
authored
Jan 29, 2013
by
yoogx
Browse files
* Fix building in case LUA is not available on the platform
parent
ade0681f
Changes
3
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
17bd61d2
...
...
@@ -110,9 +110,17 @@ AC_ARG_ENABLE(giop,
[ --enable-giop Use the GIOP protocol],
[ AC_DEFINE([__PO_HI_USE_GIOP], [], ["Enable the GIOP protocol"])])
HAS_LUA_=
AC_ARG_ENABLE(lua,
[ --enable-lua Use the LUA script engine],
[ AC_DEFINE([__PO_HI_USE_LUA], [], ["Enable the LUA script engine"])])
[ AC_DEFINE([__PO_HI_USE_LUA], [], ["Enable the LUA script engine"])
if [[ "$enableval" = "yes" ]]; then
HAS_LUA_=true
fi])
AC_SUBST(HAS_LUA_)
AM_CONDITIONAL(HAS_LUA, [test ! "x$HAS_LUA_" = "x"])
############################################
# Set the value corresponding to cygpath -u
...
...
@@ -158,14 +166,14 @@ dnl may, one day, be edited automatically to remove
dnl some entries.
AC_OUTPUT([
Makefile
doc/Makefile
src/Makefile
src/drivers/Makefile
src/drivers/configuration/Makefile
include/Makefile
include/drivers/Makefile
include/drivers/configuration/Makefile
Makefile
doc/Makefile
src/Makefile
src/drivers/Makefile
src/drivers/configuration/Makefile
include/Makefile
include/drivers/Makefile
include/drivers/configuration/Makefile
examples/Makefile
examples/aadlv1/Makefile
examples/aadlv1/d3.1.3-1/Makefile
...
...
@@ -175,7 +183,7 @@ AC_OUTPUT([
examples/aadlv1/sunseeker/Makefile
examples/aadlv2/Makefile
examples/aadlv2/d3.1.3-1/Makefile
examples/aadlv2/import/Makefile
examples/aadlv2/import/Makefile
examples/aadlv2/ping/Makefile
examples/aadlv2/lua/Makefile
examples/aadlv2/producer-consumer/Makefile
...
...
@@ -187,7 +195,7 @@ AC_OUTPUT([
examples/aadlv2/some-types/Makefile
examples/aadlv2/some-types-stdint/Makefile
examples/aadlv2/sunseeker/Makefile
tools/Makefile
tools/Makefile
tools/check-symbols/Makefile
tools/check-symbols/examples/Makefile
tools/check-symbols/examples/malloc/Makefile
...
...
examples/aadlv2/lua/Makefile.am
View file @
17bd61d2
...
...
@@ -3,9 +3,11 @@ AADL_FILES = \
$(srcdir)
/lua-ping.aadl
\
$(srcdir)
/lua-simple.aadl
if
HAS_LUA
SCENARIO_FILES
=
\
$(srcdir)
/scenario.aadl
\
$(srcdir)
/scenario-ping.aadl
$(srcdir)
/scenario-ping.aadl
endif
include
$(srcdir)/../../Makefile.common
...
...
share/lua/libs/Makefile.am
View file @
17bd61d2
AUTOMAKE_OPTIONS
=
no-dependencies
LIBS_FILES
=
$(srcdir)
/liblua-linux64.a
\
$(srcdir)
/liblua-linux32.a
\
$(srcdir)
/liblua-leon.a
LIBS_FILES
=
$(srcdir)
/liblua-linux64.a
$(srcdir)
/liblua-linux32.a
\
$(srcdir)
/liblua-leon.a
$(srcdir)
/liblua-leon-rtems48.a
libdest
=
${
shell
$(CYGPATH_U)
'
$(OCARINA_RUNTIME)
/polyorb-hi-c/libs'
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment