Merge pull request #704 from hills/configure-exit

Packaging scripts can miss out on these errors
This commit is contained in:
Mészáros Mihály 2021-03-23 09:41:28 +01:00 committed by GitHub
commit 97c93725af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

20
configure vendored
View File

@ -605,7 +605,7 @@ if [ -z "${CC}" ] ; then
if [ -z "$CC" ] ; then if [ -z "$CC" ] ; then
${ECHO_CMD} "ERROR: failed to a find working C compiler" ${ECHO_CMD} "ERROR: failed to a find working C compiler"
cleanup cleanup
exit exit 1
fi fi
else else
${CC} ${TMPCPROGC} ${OSCFLAGS} -o ${TMPCPROGB} 2>>/dev/null ${CC} ${TMPCPROGC} ${OSCFLAGS} -o ${TMPCPROGB} 2>>/dev/null
@ -613,7 +613,7 @@ else
if ! [ ${ER} -eq 0 ] ; then if ! [ ${ER} -eq 0 ] ; then
${ECHO_CMD} "ERROR: cannot use compiler ${CC} properly" ${ECHO_CMD} "ERROR: cannot use compiler ${CC} properly"
cleanup cleanup
exit exit 1
fi fi
fi fi
@ -642,13 +642,13 @@ if [ -z "$PKGCONFIG" ] ; then
if [ -z "$PKGCONFIG" ] ; then if [ -z "$PKGCONFIG" ] ; then
${ECHO_CMD} "ERROR: pkg-config not found" ${ECHO_CMD} "ERROR: pkg-config not found"
cleanup cleanup
exit exit 1
fi fi
else else
if ! type "$PKGCONFIG" 2>/dev/null ; then if ! type "$PKGCONFIG" 2>/dev/null ; then
${ECHO_CMD} "ERROR: cannot use $PKGCONFIG" ${ECHO_CMD} "ERROR: cannot use $PKGCONFIG"
cleanup cleanup
exit exit 1
fi fi
fi fi
@ -726,7 +726,7 @@ pthread_testlib
ER=$? ER=$?
if [ ${ER} -ne 0 ] ; then if [ ${ER} -ne 0 ] ; then
${ECHO_CMD} "ERROR: Cannot find pthread library functions." ${ECHO_CMD} "ERROR: Cannot find pthread library functions."
exit exit 1
fi fi
if [ -z ${TURN_NO_THREAD_BARRIERS} ] ; then if [ -z ${TURN_NO_THREAD_BARRIERS} ] ; then
@ -758,7 +758,7 @@ if [ -n "${SSL_CFLAGS}" ] && [ -n "${SSL_LIBS}" ]; then
ER=$? ER=$?
if ! [ ${ER} -eq 0 ] ; then if ! [ ${ER} -eq 0 ] ; then
${ECHO_CMD} "Private SSL Library option cannot be used" ${ECHO_CMD} "Private SSL Library option cannot be used"
exit exit 1
else else
OSCFLAGS="${OSCFLAGS} ${SSL_CFLAGS}" OSCFLAGS="${OSCFLAGS} ${SSL_CFLAGS}"
OSLIBS="${OSLIBS} ${SSL_LIBS}" OSLIBS="${OSLIBS} ${SSL_LIBS}"
@ -775,7 +775,7 @@ else
${ECHO_CMD} "ERROR: OpenSSL Crypto development libraries are not installed properly in required location." ${ECHO_CMD} "ERROR: OpenSSL Crypto development libraries are not installed properly in required location."
${ECHO_CMD} "Abort." ${ECHO_CMD} "Abort."
cleanup cleanup
exit exit 1
fi fi
fi fi
@ -790,7 +790,7 @@ else
${ECHO_CMD} "ERROR: OpenSSL development libraries are not installed properly in required location." ${ECHO_CMD} "ERROR: OpenSSL development libraries are not installed properly in required location."
${ECHO_CMD} "Abort." ${ECHO_CMD} "Abort."
cleanup cleanup
exit exit 1
fi fi
fi fi
fi fi
@ -820,7 +820,7 @@ if [ -n "${EVENT_CFLAGS}" ] && [ -n "${EVENT_LIBS}" ]; then
ER=$? ER=$?
if ! [ ${ER} -eq 0 ] ; then if ! [ ${ER} -eq 0 ] ; then
${ECHO_CMD} "Private Event Library option cannot be used" ${ECHO_CMD} "Private Event Library option cannot be used"
exit exit 1
else else
OSCFLAGS="${OSCFLAGS} ${EVENT_CFLAGS}" OSCFLAGS="${OSCFLAGS} ${EVENT_CFLAGS}"
OSLIBS="${OSLIBS} ${EVENT_LIBS}" OSLIBS="${OSLIBS} ${EVENT_LIBS}"
@ -834,7 +834,7 @@ else
${ECHO_CMD} "See the INSTALL file." ${ECHO_CMD} "See the INSTALL file."
${ECHO_CMD} "Abort." ${ECHO_CMD} "Abort."
cleanup cleanup
exit exit 1
fi fi
fi fi