mirror of
https://github.com/octoleo/lsyncd.git
synced 2024-12-12 14:17:47 +00:00
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:
commit
5ec68314fe
@ -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
10
configure.ac
@ -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])
|
||||
|
Loading…
Reference in New Issue
Block a user