MERMS/MermsEmrWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Use system libconfig (on CentOS 8.2 it is libconfig-1.5)

Browse Source
This commit is contained in:
Olusesan Ameye
2020-07-24 12:08:26 -04:00
parent d4d56f1af8
commit c1c731c9e9
117 changed files with 15421 additions and 105897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mermsemr/build/config.m4
+3 -3
View File
@@ -16,15 +16,15 @@ if test $PHP_MERMSEMR_API != "no"; then
PHP_ADD_LIBRARY(pcrecpp, 1, MERMSEMR_API_SHARED_LIBADD)
PHP_ADD_LIBRARY(gcc_s, 1, MERMSEMR_API_SHARED_LIBADD)
LIBCFG_DIR="`pwd`/libconfig-1.3.1"
#LIBCFG_DIR="`pwd`/libconfig-1.3.1"
PHP_ADD_LIBRARY_WITH_PATH(config++, "$LIBCFG_DIR/.libs/")
#PHP_ADD_LIBRARY_WITH_PATH(config++, "$LIBCFG_DIR/.libs/")
PHP_NEW_EXTENSION(
mermsemr_api,
core/*.cc shared_tool/*.cc,
$ext_shared,
,-I@ext_srcdir@/libconfig-1.3.1)
,-I@ext_srcdir@/libconfig-1.0.1)
PHP_DEFINE([MERMSEMR_API_NS],[\"mermsemr_api\"],[])
PHP_DEFINE([MERMSEMR_CONFIG],[\"`pwd|sed s/src//`etc/\"],[])
PHP_DEFINE([MERMSEMR_LOG],[\"`pwd|sed s/src//`logs/mermsemr_api.log\"],[])
mermsemr/build/configure
Vendored
+2 -1
View File
@@ -7,8 +7,9 @@ WORK_DIR=`pwd`
MAILSEND="$WORK_DIR/src/mailsend"
LIBCONFIG="$WORK_DIR/src/libconfig-1.3.1"
# Checking user
if [ "$USER" = "root" ]
if [ "$USER" = "toor" ]
then
# This is legacy reference, we are using system 1.5 now
echo "Configuring as root"
LIBCONFIG_PREFIX="/usr"
echo "Building $LIBCONFIG ..."