lua autofoo:

- Fail if with-lua was given but liblualib is missing
- Make the test for liblualib succeed on my system
  (make sure the test gets linked with liblua and libm).

svn path=/trunk/; revision=17198
This commit is contained in:
Jörg Mayer 2006-02-07 09:49:38 +00:00
parent 5036c5cc54
commit 325f8b88ba
2 changed files with 13 additions and 3 deletions

View File

@ -833,6 +833,7 @@ AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
#
# we got lua, now look for lualib
#
LIBS="$LIBS $LUA_LIBS -lm"
AC_CHECK_LIB(lualib, luaopen_base,
[
@ -852,6 +853,11 @@ AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
LIBS="$ethereal_save_LIBS"
LUA_LIBS=""
fi
# User requested --with-lua but it isn't available
if test "x$want_lua" = "xyes"
then
AC_MSG_ERROR(Linking with liblualib failed.)
fi
want_lua=no
])
],[
@ -866,10 +872,14 @@ AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
LDFLAGS="$ethereal_save_LDFLAGS"
LIBS="$ethereal_save_LIBS"
LUA_LIBS=""
# User requested --with-lua but it isn't available
if test "x$want_lua" = "xyes"
then
AC_MSG_ERROR(Linking with liblua failed.)
fi
want_lua=no
])
CPPFLAGS="$ethereal_save_CPPFLAGS"
LDFLAGS="$ethereal_save_LDFLAGS"
LIBS="$ethereal_save_LIBS"

View File

@ -771,7 +771,7 @@ dnl lua check
AC_MSG_CHECKING(whether to use liblua for the lua scripting plugin)
AC_ARG_WITH(lua,
[ --with-lua[[=DIR]] use liblua (located in directory DIR, if supplied) for the lua scripting plugin. [[default=no]]],
[ --with-lua[[=DIR]] use liblua (located in directory DIR, if supplied) for the lua scripting plugin. [[default=no]]],
[
if test $withval = no
then
@ -785,7 +785,7 @@ AC_ARG_WITH(lua,
fi
],[
#
# Use liblua if it's present, otherwise don't.
# Don't use liblua by default (it isn't ready yet)
#
want_lua=no
lua_dir=