blob: e80615e549b621cc38a0e41822360c15c4a6a6fe (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 0ed05474a5ea50cc972fae620fd1580ed0026fca Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 7 Apr 2021 00:28:07 +0000
Subject: [PATCH 1/2] Unbundle Lua 5.1 and dynamically link with system copy
Signed-off-by: Sam James <sam@gentoo.org>
---
Makefile.am | 6 ++----
configure.ac | 3 +++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 334b80e..b24ad29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/source/ -I$(top_srcdir)/source/lua/src
+AM_CXXFLAGS = -I$(top_srcdir)/source/ $(LUA_CFLAGS)
bin_PROGRAMS = epiar
@@ -74,9 +74,7 @@ epiar_SOURCES = source/main.cpp \
source/Utilities/trig.cpp \
source/Utilities/xml.cpp
-epiar_LDADD = source/lua/src/liblua.a
-
-SUBDIRS=source/lua
+epiar_LDADD = $(LUA_LIBS)
include resources/Animations/Makefile.am
include resources/audio/Makefile.am
diff --git a/configure.ac b/configure.ac
index 17202ae..b5a70d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,9 @@ case "$target" in *-apple-darwin*)
LIBS="$LIBS `xml2-config --libs`"
esac
+dnl Check for Lua 5.1
+PKG_CHECK_MODULES([LUA], [lua5.1], [], [AC_MSG_ERROR([Could not find needed Lua 5.1])])
+
dnl Check for SDL
SDL_VERSION=1.2.10
--
2.31.1
|
GitWeb
