diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-03 12:13:07 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-03 12:13:07 +0000 |
| commit | f4d56435b5a76746415c75e2f3254965ecb8b801 (patch) | |
| tree | ecbb76dc92851324dc180c61a8836cf3d31ba81a | |
| parent | fc6249dd39a8467b5f64963d4a213872ff8d9ba7 (diff) | |
Use liblua by default, if available.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28621 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 5136b73de0..a80ccff7ba 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -922,6 +922,7 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[ LUA_INCLUDES="" fi AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1]) + want_lua=yes ],[ # @@ -935,8 +936,9 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[ # # Lua 5.1 found # - AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1]) LUA_LIBS=" -llua5.1 -lm" + AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1]) + want_lua=yes ],[ # # Restore the versions of CFLAGS, CPPFLAGS, diff --git a/configure.in b/configure.in index ca866853fa..a995f3d523 100644 --- a/configure.in +++ b/configure.in @@ -1080,7 +1080,7 @@ AC_MSG_CHECKING(whether to use liblua for the lua scripting plugin) AC_ARG_WITH(lua, AC_HELP_STRING( [--with-lua@<:@=DIR@:>@], - [use liblua (located in directory DIR, if supplied) for the lua scripting plugin. @<:@default=no@:>@]), + [use liblua (located in directory DIR, if supplied) for the lua scripting plugin. @<:@default=yes, if available@:>@]), [ if test $withval = no then @@ -1094,9 +1094,9 @@ AC_ARG_WITH(lua, fi ],[ # - # Don't use liblua by default (it isn't ready yet) + # Use liblua by default # - want_lua=no + want_lua=ifavailable lua_dir= ]) if test "x$want_lua" = "xno" ; then |