diff --git a/Makefile.win b/Makefile.win index 2578963..408bbd1 100644 --- a/Makefile.win +++ b/Makefile.win @@ -36,19 +36,19 @@ BUILDDATE := $(BUILDDATE) AFTERCLEAN = (find . -type f -name "*.o" -delete && find . -type f -name "*.res" -delete && find src/ -type f -name "Makefile.var" -delete && find bin/ -type f -executable -delete) || true ifndef OPENSSL_CHECK -OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d '\\' | cc -x c $(CFLAGS) $(LDFLAGS) -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;}" | tr -d '\\\\' | 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;}" | tr -d '\\\\' | 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 PCRE_CHECK = $(shell echo "\#define PCRE2_CODE_UNIT_WIDTH 8\\n#include \\n int main(){return 0;}" | tr -d '\\' | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre2-8 -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false) ifeq ($(PCRE_CHECK), true) PLUGINS += PCREPlugin endif -PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d '\\' | 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 endif include Makefile.inc diff --git a/src/plugins/PCREPlugin/Makefile.inc b/src/plugins/PCREPlugin/Makefile.inc index a9c356e..b00a74c 100644 --- a/src/plugins/PCREPlugin/Makefile.inc +++ b/src/plugins/PCREPlugin/Makefile.inc @@ -1,4 +1,7 @@ all: $(BUILDDIR)PCREPlugin$(DLSUFFICS) +pcre_plugin$(OBJSUFFICS): pcre_plugin.c + $(CC) $(DCFLAGS) $(CFLAGS) pcre_plugin.c + $(BUILDDIR)PCREPlugin$(DLSUFFICS): pcre_plugin$(OBJSUFFICS) $(LN) $(LNOUT)../../$(BUILDDIR)PCREPlugin$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) pcre_plugin$(OBJSUFFICS) $(LIBSPREFIX)pcre2-8$(LIBSSUFFIX)