octoleo
/
lsyncd
mirror of https://github.com/octoleo/lsyncd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from devurandom/fix/check-for-lua 

Check for presence of lua and luac in configure and use path in Makefile
This commit is contained in:
Axel Kittenberger 2012-10-01 21:47:19 -07:00
parent c77298cc74 6a5eb24a90
commit 5ec68314fe
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -46,14 +46,14 @@ runner.o: runner.c
defaults.o: defaults.c
runner.c: runner.out bin2carray.lua
lua ./bin2carray.lua $< runner $@
$(LUA) ./bin2carray.lua $< runner $@
defaults.c: defaults.out bin2carray.lua
lua ./bin2carray.lua $< defaults $@
$(LUA) ./bin2carray.lua $< defaults $@
runner.out: lsyncd.lua
luac -o $@ $<
$(LUAC) -o $@ $<
defaults.out: default.lua default-rsync.lua default-rsyncssh.lua default-direct.lua
luac -o $@ $^
$(LUAC) -o $@ $^

10
configure.ac
View File

@ -26,6 +26,16 @@ PKG_CHECK_MODULES([LUA], [lua >= 5.1.3])
])
])
AC_PATH_PROGS([LUA], [lua5.1 lua51 lua], [no])
if test x${LUA} = xno ; then
AC_MSG_ERROR([Program 'lua' is required])
fi
AC_PATH_PROGS([LUAC], [luac5.1 luac51 luac], [no])
if test x${LUAC} = xno ; then
AC_MSG_ERROR([Program 'luac' is required])
fi
###
# Checks for header files.
AC_CHECK_HEADERS([sys/inotify.h])