diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-03 15:28:30 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-03 15:28:30 +0000 |
| commit | 863e456e78562c2267da5263c1aae247230801a5 (patch) | |
| tree | 4f4de4e70469ed8ebf1109444fe5a380c3c2d23d /acinclude.m4 | |
| parent | d861a1a6dc26b0d5706b91d5151b8393202fef85 (diff) | |
Fixed setting of LUA_INCLUDES when having extraneous lua heder directory.
Fixed resetting flags after negative check for Lua.
svn path=/trunk/; revision=28624
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 83cccbdb60..cfea175a5c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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 # |