octoleo/lsyncd
1
0
Fork 0
mirror of https://github.com/octoleo/lsyncd.git synced 2024-12-12 14:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for presence of lua and luac in configure and use path in Makefile

Browse Source 
This should help to prevent generating lua bytecode for a different version
 than the library being linked to. Not at all reliable, but a bit better
 than before.
This commit is contained in:
Dennis Schridde 2012-10-02 02:32:15 +02:00
parent ddbf2c2a19
commit 6a5eb24a90
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 defaults.o: defaults.c
runner.c: runner.out bin2carray.lua runner.c: runner.out bin2carray.lua
lua ./bin2carray.lua $< runner $@ $(LUA) ./bin2carray.lua $< runner $@
defaults.c: defaults.out bin2carray.lua defaults.c: defaults.out bin2carray.lua
lua ./bin2carray.lua $< defaults $@ $(LUA) ./bin2carray.lua $< defaults $@
runner.out: lsyncd.lua runner.out: lsyncd.lua
luac -o $@ $< $(LUAC) -o $@ $<
defaults.out: default.lua default-rsync.lua default-rsyncssh.lua default-direct.lua defaults.out: default.lua default-rsync.lua default-rsyncssh.lua default-direct.lua
luac -o $@ $^ $(LUAC) -o $@ $^

10
configure.ac
View File

@ -20,6 +20,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. # Checks for header files.
AC_CHECK_HEADERS([sys/inotify.h]) AC_CHECK_HEADERS([sys/inotify.h])