jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into devel

Browse source 
Conflicts:
	configure.ac
This commit is contained in:
Oliver Buchtala 2014-03-06 04:40:13 +01:00
commit c91b28b908
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1097,6 +1097,8 @@ if test x"${with_javascript}" = xno -o x"${with_alllang}" = xno ; then
AC_MSG_NOTICE([Disabling Javascript]) AC_MSG_NOTICE([Disabling Javascript])
JAVASCRIPT= JAVASCRIPT=
else else
JAVASCRIPT=1
#---------------------------------------------------------------- #----------------------------------------------------------------
# General Javascript settings shared by JSC and V8 # General Javascript settings shared by JSC and V8
#---------------------------------------------------------------- #----------------------------------------------------------------