diff options
| -rw-r--r-- | configure.ac | 20 | ||||
| -rwxr-xr-x | netdata-installer.sh | 21 |
2 files changed, 20 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 5d1db8700b..9192753a6c 100644 --- a/configure.ac +++ b/configure.ac @@ -292,6 +292,26 @@ freebsd*) darwin*) build_target=macos LDFLAGS="${LDFLAGS} -framework CoreFoundation -framework IOKit" + # ----------------------------------------------------------------------------- + # Pull in OpenSSL properly if on macOS + if brew --prefix > /dev/null 2>&1; then + if brew --prefix --installed openssl > /dev/null 2>&1; then + HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl) + elif brew --prefix --installed openssl@3 > /dev/null 2>&1; then + HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@3) + elif brew --prefix --installed openssl@1.1 > /dev/null 2>&1; then + HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@1.1) + fi + if test -n "${HOMEBREW_OPENSSL_PREFIX}"; then + OPTIONAL_OS_DEP_CFLAGS="-I${HOMEBREW_OPENSSL_PREFIX}/include" + CFLAGS="${CFLAGS} ${OPTIONAL_OS_DEP_CFLAGS}" + LDFLAGS="${LDFLAGS} -L${HOMEBREW_OPENSSL_PREFIX}/lib" + fi + HOMEBREW_PREFIX=$(brew --prefix) + OPTIONAL_OS_DEP_CFLAGS="${OPTIONAL_OS_DEP_CFLAGS} -I${HOMEBREW_PREFIX}/include" + CFLAGS="${CFLAGS} -I${HOMEBREW_PREFIX}/include" + LDFLAGS="${LDFLAGS} -L${HOMEBREW_PREFIX}/lib" + fi ;; *) build_target=linux diff --git a/netdata-installer.sh b/netdata-installer.sh index 545fe61fb4..f59bc2b34f 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -29,27 +29,6 @@ if [ "${NETDATA_SOURCE_DIR}" != "${INSTALLER_DIR}" ] && [ "${INSTALLER_DIR}" != fi # ----------------------------------------------------------------------------- -# Pull in OpenSSL properly if on macOS -if [ "$(uname -s)" = 'Darwin' ]; then - if brew --prefix > /dev/null 2>&1; then - if brew --prefix --installed openssl > /dev/null 2>&1; then - HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl) - elif brew --prefix --installed openssl@3 > /dev/null 2>&1; then - HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@3) - elif brew --prefix --installed openssl@1.1 > /dev/null 2>&1; then - HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@1.1) - fi - if [ -n "${HOMEBREW_OPENSSL_PREFIX}" ]; then - export CFLAGS="${CFLAGS} -I${HOMEBREW_OPENSSL_PREFIX}/include" - export LDFLAGS="${LDFLAGS} -L${HOMEBREW_OPENSSL_PREFIX}/lib" - fi - HOMEBREW_PREFIX=$(brew --prefix) - export CFLAGS="${CFLAGS} -I${HOMEBREW_PREFIX}/include" - export LDFLAGS="${LDFLAGS} -L${HOMEBREW_PREFIX}/lib" - fi -fi - -# ----------------------------------------------------------------------------- # reload the user profile # shellcheck source=/dev/null |