diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-05-09 20:08:40 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-05-10 16:08:32 +0000 |
| commit | 5dbb0a7b2a4fd212fc4fee181fc86e778243dac9 (patch) | |
| tree | 2f96ee268fa50f4a75bb068a654692efd7a666ae /Makefile.am | |
| parent | 11056dd815b7291add6c9cc1b6a9edd82558aa5c (diff) | |
build: fix Lua build
Each of Lua's major versions are incompatible with each other. Ubuntu,
at least, does not provide a single liblua.so or /usr/include/lua; all
SOs and headers are versioned, e.g. liblua5.3.so and
/usr/include/lua5.3. There's already an m4 macro in the GNU collection
to handle this situation, so let's use that.
This allows building with Lua enabled to work on platforms other than
Fedora.
* Move lib/lua.[ch] -> lib/frrlua.[ch] to prevent path conflicts
* Fix configure.ac search for proper CPP and linker flags
* Add Lua include path to AM_CPPFLAGS
* Update vtysh/extract.pl.in
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 546aa85fe7..11188ea157 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,9 @@ AM_CFLAGS = \ # end AM_CPPFLAGS = \ -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \ - -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib + -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib \ + $(LUA_INCLUDE) \ + # end AM_LDFLAGS = \ -export-dynamic \ $(AC_LDFLAGS) \ |