archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes to the automated Ubuntu install script, and automatic detection of xulrunner level (as it changes often) in configure.ac.

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@923071 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jsdelfino 2010-03-15 06:13:25 +00:00
commit a91627d5b8
4 changed files with 90 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sca-cpp/trunk/configure.ac
View file

@ -84,21 +84,25 @@ AC_SUBST(LIBXML2_LIB)
# Configure path to libmozjs includes and lib.
AC_MSG_CHECKING([for js-include])
xulrunner=`ls /usr/include | grep "xulrunner" | tail -1`
if test "$xulrunner" = ""; then
xulrunner="xulrunner-1.9.1.8"
fi
AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH], [path to installed SpiderMonkey include dir
[default=/usr/include/xulrunner-1.9.1.8/unstable]])], [
[default=/usr/include/$xulrunner/unstable]])], [
JS_INCLUDE="${withval}"
AC_MSG_RESULT("${withval}")
], [
JS_INCLUDE="/usr/include/xulrunner-1.9.1.8/unstable"
AC_MSG_RESULT(/usr/include/xulrunner-1.9.1.8/unstable)
JS_INCLUDE="/usr/include/$xulrunner/unstable"
AC_MSG_RESULT(/usr/include/$xulrunner/unstable)
])
AC_MSG_CHECKING([for js-lib])
AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib/xulrunner-1.9.1.8]])], [
AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib/$xulrunner]])], [
JS_LIB="${withval}"
AC_MSG_RESULT("${withval}")
], [
JS_LIB="/usr/lib/xulrunner-1.9.1.8"
AC_MSG_RESULT(/usr/lib/xulrunner-1.9.1.8)
JS_LIB="/usr/lib/$xulrunner"
AC_MSG_RESULT(/usr/lib/$xulrunner)
])
AC_SUBST(JS_INCLUDE)
AC_SUBST(JS_LIB)