diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e45564b..78253bf 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -26,9 +26,15 @@ jobs: - name: ln Linux if: ${{ startsWith(matrix.target, 'ubuntu') }} run: ln -s Makefile.Linux Makefile + - name: Linux libraries + if: ${{ startsWith(matrix.target, 'ubuntu') }} + run: sudo apt install libssl-dev libpam-dev - name: ln Mac if: ${{ startsWith(matrix.target, 'macos') }} run: ln -s Makefile.FreeBSD Makefile + - name: Mac variables + if: ${{ startsWith(matrix.target, 'macos') }} + run: echo "LDFLAGS=-L/usr/local/opt/openssl/lib -L/opt/homebrew/opt/openssl/lib" >> $GITHUB_ENV && echo "CFLAGS=-I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include" >> $GITHUB_ENV - name: ln Windows if: ${{ startsWith(matrix.target, 'windows') }} run: copy Makefile.win Makefile diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD index 6431d40..81857ff 100644 --- a/Makefile.FreeBSD +++ b/Makefile.FreeBSD @@ -30,12 +30,12 @@ TYPECOMMAND = cat COMPATLIBS = MAKEFILE = Makefile.FreeBSD PLUGINS ?= StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin -OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) +OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif -PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) +PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) ifeq ($(PAM_CHECK), true) PLUGINS += PamAuth endif diff --git a/Makefile.Linux b/Makefile.Linux index ad1d713..21bb004 100644 --- a/Makefile.Linux +++ b/Makefile.Linux @@ -36,12 +36,12 @@ MAKEFILE = Makefile.Linux LIBS ?= -ldl #PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin PamAuth PLUGINS ?= StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin -OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) +OPENSSL_CHECK = $(shell echo "#include \\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif -PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) +PAM_CHECK = $(shell echo "#include \\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) ifeq ($(PAM_CHECK), true) PLUGINS += PamAuth endif diff --git a/Makefile.unix b/Makefile.unix index 8642b24..f062e93 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -34,12 +34,12 @@ TYPECOMMAND = cat COMPATLIBS = MAKEFILE = Makefile.unix PLUGINS ?= StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin -OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) +OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif -PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) +PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) ifeq ($(PAM_CHECK), true) PLUGINS += PamAuth endif