aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wslua
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2015-01-23 07:36:50 -0500
committerJeff Morriss <jeff.morriss.ws@gmail.com>2015-02-04 00:53:29 +0000
commit4fe8ca05767f2a4ec160eae412f5b2fd0ee0903b (patch)
tree5a107c11b091f946ae461314d34180e13951c177 /epan/wslua
parent0e74e8b0cc3a02457b05c1afd83fb02ba7255927 (diff)
Simplify how we find Lua and expand the places we look.
First, it appears some packagers actually ship a pkg-config file for Lua. Try to use it. (Unfortunately the package name varies so we have to try several package names.) If that fails, try to find Lua directly, accounting for the various naming conventions we've seen. Bug: 10475 Bug: 10572 Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a Reviewed-on: https://code.wireshark.org/review/6756 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'epan/wslua')
-rw-r--r--epan/wslua/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index 6d2caa47dd..9dd866f33f 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -23,7 +23,7 @@ if HAVE_WARNINGS_AS_ERRORS
AM_CFLAGS = -Werror
endif
-AM_CPPFLAGS = -I$(top_srcdir) @LUA_INCLUDES@
+AM_CPPFLAGS = -I$(top_srcdir) @LUA_CFLAGS@
noinst_LTLIBRARIES = libwslua.la