mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-10-25 21:11:00 +02:00
Code Issues Projects Releases Wiki Activity

configure: use pkg-config for hiredis

Browse Source
This commit is contained in:
Hristo Venev 2020-10-26 19:02:53 +02:00
parent af437e6751
commit e7940bb849
1 changed files with 7 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
configure vendored
View File

@ -19,8 +19,6 @@ cleanup() {
rm -rf ${D_TMPCPROGB} rm -rf ${D_TMPCPROGB}
rm -rf ${E_TMPCPROGC} rm -rf ${E_TMPCPROGC}
rm -rf ${E_TMPCPROGO} rm -rf ${E_TMPCPROGO}
rm -rf ${HR_TMPCPROGC}
rm -rf ${HR_TMPCPROGB}
rm -rf ${TMPCADDRPROGO} rm -rf ${TMPCADDRPROGO}
} }
@ -76,32 +74,6 @@ testlibevent2_comp() {
fi fi
} }
testhiredis() {
if [ -z "${HIREDIS_CFLAGS}" ] || [ -z "${HIREDIS_LIBS}" ]; then
for inc in ${INCLUDEDIR}/hiredis /usr/local/include/hiredis /usr/hiredis /usr/include/hiredis
do
if [ -d ${inc} ] ; then
HIREDIS_CFLAGS="${HIREDIS_CFLAGS} -I${inc}"
fi
done
HIREDIS_LIBS=-lhiredis
fi
${CC} ${HR_TMPCPROGC} -o ${HR_TMPCPROGB} ${OSCFLAGS} ${DBLIBS} ${HIREDIS_CFLAGS} ${HIREDIS_LIBS} ${OSLIBS} 2>>/dev/null
ER=$?
if ! [ ${ER} -eq 0 ] ; then
${ECHO_CMD}
${ECHO_CMD} "HIREDIS DEVELOPMENT LIBRARY (libhiredis.*) AND/OR HEADERS (hiredis/*.h)"
${ECHO_CMD} " ARE NOT INSTALLED PROPERLY ON THIS SYSTEM."
${ECHO_CMD} " THAT'S OK BUT THE TURN SERVER IS BUILDING WITHOUT REDIS SUPPORT."
${ECHO_CMD}
return 0
else
DBCFLAGS="${DBCFLAGS} ${HIREDIS_CFLAGS}"
DBLIBS="${DBLIBS} ${HIREDIS_LIBS}"
return 1
fi
}
testlibpq() { testlibpq() {
if [ -z "${PSQL_CFLAGS}" ] || [ -z "${PSQL_LIBS}" ]; then if [ -z "${PSQL_CFLAGS}" ] || [ -z "${PSQL_LIBS}" ]; then
PSQL_CFLAGS="-I${PREFIX}/pgsql/include -I${PREFIX}/include/pgsql/ -I${PREFIX}/include/postgres/ -I${PREFIX}/postgres/include/ -I${PREFIX}/include/postgresql/ -I${PREFIX}/postgresql/include/" PSQL_CFLAGS="-I${PREFIX}/pgsql/include -I${PREFIX}/include/pgsql/ -I${PREFIX}/include/postgres/ -I${PREFIX}/postgres/include/ -I${PREFIX}/include/postgresql/ -I${PREFIX}/postgresql/include/"
@ -717,20 +689,6 @@ int main(int argc, char** argv) {
} }
! !
HR_TMPCPROG=__test__ccomp__hiredis__$$
HR_TMPCPROGC=${TMPDIR}/${HR_TMPCPROG}.c
HR_TMPCPROGB=${TMPDIR}/${HR_TMPCPROG}
cat > ${HR_TMPCPROGC} <<!
#include <stdlib.h>
#include <hiredis/hiredis.h>
#include <hiredis/async.h>
int main(int argc, char** argv) {
redisAsyncHandleRead(NULL);
return (int)(argv[argc][0]);
}
!
PQ_TMPCPROG=__test__ccomp__libpq__$$ PQ_TMPCPROG=__test__ccomp__libpq__$$
PQ_TMPCPROGC=${TMPDIR}/${PQ_TMPCPROG}.c PQ_TMPCPROGC=${TMPDIR}/${PQ_TMPCPROG}.c
PQ_TMPCPROGB=${TMPDIR}/${PQ_TMPCPROG} PQ_TMPCPROGB=${TMPDIR}/${PQ_TMPCPROG}
@ -1191,19 +1149,14 @@ fi
########################### ###########################
if [ -z "${TURN_NO_HIREDIS}" ] ; then if [ -z "${TURN_NO_HIREDIS}" ] ; then
if testpkg_db hiredis; then
testhiredis ${ECHO_CMD} "Hiredis found."
else
ER=$? ${ECHO_CMD} "Hiredis not found. Building without hiredis support."
if ! [ ${ER} -eq 0 ] ; then TURN_NO_HIREDIS="-DTURN_NO_HIREDIS"
${ECHO_CMD} "Hiredis found." fi
else
TURN_NO_HIREDIS="-DTURN_NO_HIREDIS"
fi
else else
TURN_NO_HIREDIS="-DTURN_NO_HIREDIS" TURN_NO_HIREDIS="-DTURN_NO_HIREDIS"
fi fi
############################### ###############################