GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch '1.9.4' of tasktools.org:task into 1.9.4

Browse source
This commit is contained in:
Paul Beckingham 2010-12-24 00:28:35 -05:00
commit d9bd9c3532
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS
View file

@ -35,6 +35,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
Andraž 'ruskie' Levstik Andraž 'ruskie' Levstik
Irfan Siddiqui Irfan Siddiqui
Itay Perl Itay Perl
Sander Marechal
Thanks to the following, who submitted detailed bug reports and excellent Thanks to the following, who submitted detailed bug reports and excellent
suggestions: suggestions:
@ -67,7 +68,6 @@ suggestions:
Elizabeth Maxson Elizabeth Maxson
Peter De Poorter Peter De Poorter
Max Muller Max Muller
Sander Marechal
Thomas Sattler Thomas Sattler
Erlan Sergaziev Erlan Sergaziev

23
configure.ac
View file

@ -113,6 +113,7 @@ AC_ARG_WITH([lua-lib],
if test "x$with_lua" = "xyes" ; then if test "x$with_lua" = "xyes" ; then
AC_DEFINE([HAVE_LIBLUA], [1], [Defined if you have liblua]) AC_DEFINE([HAVE_LIBLUA], [1], [Defined if you have liblua])
if test -n "$lua_inc"; then if test -n "$lua_inc"; then
CFLAGS="$CFLAGS -I$lua_inc" CFLAGS="$CFLAGS -I$lua_inc"
CXXFLAGS="$CXXFLAGS -I$lua_inc" CXXFLAGS="$CXXFLAGS -I$lua_inc"
@ -122,7 +123,27 @@ if test "x$with_lua" = "xyes" ; then
LDFLAGS="$LDFLAGS -L$lua_lib" LDFLAGS="$LDFLAGS -L$lua_lib"
fi fi
AC_CHECK_LIB([lua],[main]) # AC_CHECK_LIB([lua],[main])
# The following code should replace the one line above, but is not working.
# Anyone know why?
# # check for lua. this is separate from the above libraries because it's
# # liblua50 on debian and liblua everywhere else.
# AC_CHECK_LIB(lua, lua_open, LIB_LUA="-llua")
# AC_CHECK_LIB(lualib, luaopen_base, LIB_LUA_LIB=-llualib, , [$LIB_LUA -ldl -lm])
#
# if test "x${LIB_LUA}" = "x"; then
# echo "Could not find liblua. Please install liblua 5.1+"
# exit 1
# fi
#
# if test "x${LIB_LUA_LIB}" = "x"; then
# echo "Could not find liblualib. Please install liblualib 5.1+"
# exit 1
# fi
#
# LDFLAGS="$LDFLAGS $LIB_LUA $LIB_LUA_LIB"
fi fi