diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-02-07 09:49:38 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-02-07 09:49:38 +0000 |
| commit | 325f8b88ba1c2817f9b9646d45460a888d2300ec (patch) | |
| tree | c11b30b9177d6275798066c87d2cfc695f672650 | |
| parent | 5036c5cc54d9359ab98b2c9ccdb78f988bab09c5 (diff) | |
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
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 991decceed..1630ffffcd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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" diff --git a/configure.in b/configure.in index 2cc9c44505..642c81cc39 100644 --- a/configure.in +++ b/configure.in @@ -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= |