osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fixed setting of LUA_INCLUDES when having extraneous lua heder directory. 

Fixed resetting flags after negative check for Lua.

svn path=/trunk/; revision=28624
This commit is contained in:
Stig Bjørlykke 2009-06-03 15:28:30 +00:00
parent d861a1a6dc
commit 863e456e78
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
acinclude.m4
View File

@ -873,10 +873,10 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
do
if test -d $lua_dir
then
LUA_INCLUDES="-I$prefix/include/lua5.1"
LUA_INCLUDES="-I$lua_dir"
found_lua_dir="$lua_dir"
break
fi
found_lua_dir="$lua_dir"
break
done
if test "x$found_lua_dir" != "x"
@ -884,6 +884,17 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
AC_MSG_RESULT(found -- $found_lua_dir)
else
AC_MSG_RESULT(not found)
#
# Restore the versions of CFLAGS, CPPFLAGS,
# LDFLAGS, and LIBS before we added the
# "--with-lua=" directory, as we didn't
# actually find lua there.
#
CFLAGS="$wireshark_save_CFLAGS"
CPPFLAGS="$wireshark_save_CPPFLAGS"
LDFLAGS="$wireshark_save_LDFLAGS"
LIBS="$wireshark_save_LIBS"
LUA_LIBS=""
if test "x$want_lua" = "xyes"
then
# we found lua5.1/lua.h, but we don't know which include dir contains it
@ -899,6 +910,17 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
fi
],
[
#
# Restore the versions of CFLAGS, CPPFLAGS,
# LDFLAGS, and LIBS before we added the
# "--with-lua=" directory, as we didn't
# actually find lua there.
#
CFLAGS="$wireshark_save_CFLAGS"
CPPFLAGS="$wireshark_save_CPPFLAGS"
LDFLAGS="$wireshark_save_LDFLAGS"
LIBS="$wireshark_save_LIBS"
LUA_LIBS=""
if test "x$lua_dir" != "x"
then
#