Skip to content

Commit

Permalink
Now only use lua_json supplied by Lmod. Do not use luarocks version b…
Browse files Browse the repository at this point in the history
…ecause it has not been fix w.r.t lua 5.2/5.3
  • Loading branch information
Robert McLay committed Nov 16, 2017
1 parent 66ff9a8 commit 96b8b65
Showing 1 changed file with 1 addition and 32 deletions.
33 changes: 1 addition & 32 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ LIBOBJS
ZSH
ZSH_SITE_FUNCTIONS_DIRS
pkgConfig
HAVE_LUA_JSON
HAVE_LUA_TERM
HAVE_LUAFILESYSTEM
SYS_LUA_CPATH
Expand Down Expand Up @@ -664,7 +663,6 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -765,7 +763,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
Expand Down Expand Up @@ -1018,15 +1015,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;

-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;

-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1164,7 +1152,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir
libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1317,7 +1305,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand Down Expand Up @@ -4032,24 +4019,6 @@ else
echo "... yes"
fi
printf "checking for lua modules: json"
missingModules=""
for i in json; do
$luaprog luaModuleAvailable $i 2> /dev/null
if test "$?" != 0 ; then
missingModules="$missingModules $i"
fi
done
if test -n "$missingModules" ; then
echo "... no"
else
HAVE_LUA_JSON=yes
echo "... yes"
fi
rm luaModuleAvailable getLFSVersion
if ! test -f $LUA_INCLUDE/lua.h; then
Expand Down

0 comments on commit 96b8b65

Please sign in to comment.