diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-03 13:45:48 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-03 13:45:48 +0000 |
| commit | d861a1a6dc26b0d5706b91d5151b8393202fef85 (patch) | |
| tree | e14b05e5b7aaf8bfcc7c00dba129b13199a1716b /acinclude.m4 | |
| parent | 76520bcc34c8b8171c3e085d1f7740c2f19d964a (diff) | |
Only give a failure message if configuring with --with-lua=yes.
svn path=/trunk/; revision=28623
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index df24961aa8..83cccbdb60 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -865,25 +865,36 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[ AC_MSG_CHECKING(for extraneous lua header directories) found_lua_dir="" lua_dir_list="/usr/include/lua5.1 $prefix/include/lua5.1" - if test "x$ac_cv_enable_usr_local" = "xyes" ; then + if test "x$ac_cv_enable_usr_local" = "xyes" + then lua_dir_list="$lua_dir_list /usr/local/include/lua5.1" fi for lua_dir in $lua_dir_list do - if test -d $lua_dir ; then + if test -d $lua_dir + then LUA_INCLUDES="-I$prefix/include/lua5.1" fi found_lua_dir="$lua_dir" break done - if test "$found_lua_dir" != "" ; then + if test "x$found_lua_dir" != "x" + then AC_MSG_RESULT(found -- $found_lua_dir) else AC_MSG_RESULT(not found) - - # we found lua5.1/lua.h, but we don't know which include dir contains it - AC_MSG_ERROR(Header file lua.h was found as lua5.1/lua.h but we can't locate the include directory. Please set the DIR for the --with-lua configure parameter.) + if test "x$want_lua" = "xyes" + then + # we found lua5.1/lua.h, but we don't know which include dir contains it + AC_MSG_ERROR(Header file lua.h was found as lua5.1/lua.h but we can't locate the include directory. Please set the DIR for the --with-lua configure parameter.) + else + # + # We couldn't find the header file; don't use the + # library, as it's probably not present. + # + want_lua=no + fi fi fi ], |