From aaa432d0f406a846aa6a43aab076561584f4b0c6 Mon Sep 17 00:00:00 2001 From: Matthew Budd Date: Sat, 2 May 2020 14:31:19 -0400 Subject: [PATCH] Build fixes for RHEL8 systems. CheckLibWithHeader of minizip installation is failing so I resorted to a simpler pkg-config check. Fixed lua library check, include path and linker flag references. --- SConstruct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index a400ebb7..c2e6b021 100644 --- a/SConstruct +++ b/SConstruct @@ -97,7 +97,7 @@ else: if conf.CheckFunc('asprintf'): conf.env.Append(CCFLAGS = "-DHAVE_ASPRINTF") if env['SYSTEM_MINIZIP']: - assert conf.CheckLibWithHeader('minizip', 'minizip/unzip.h', 'C', 'unzOpen;', 1), "please install: libminizip" + assert env.ParseConfig('pkg-config minizip --cflags --libs'), "please install: libminizip" assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib" env.Append(CPPDEFINES=["_SYSTEM_MINIZIP"]) else: @@ -153,6 +153,9 @@ else: elif conf.CheckLib('lua5.1'): lua_link_flags = "-llua5.1" lua_include_dir = "/usr/include/lua5.1" + elif conf.CheckLib('lua-5.1'): + lua_link_flags = "-llua-5.1" + lua_include_dir = "/usr/include/lua-5.1" elif conf.CheckLib('lua'): lua_link_flags = "-llua" lua_include_dir = "/usr/include/lua"