diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2018-08-03 11:01:10 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2018-08-03 11:01:10 +0300 |
| commit | 27c9dfa0d250d4c2eaeeabc77a12dbb298576f34 (patch) | |
| tree | 989347408d82890b1ed5c7a2fcc6faeb1b04b9b2 /build | |
| parent | 5cf7724c349547b433d152d3f81dc8f1c928e4e1 (diff) | |
| parent | d88270ebb87dd8dfa056096aaafedf88fc28ac4a (diff) | |
.......... [ZBX-14341] merged from upstream
Diffstat (limited to 'build')
| -rw-r--r-- | build/win32/include/config.h | 4 | ||||
| -rw-r--r-- | build/win32/project/Makefile_pcre.inc | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/build/win32/include/config.h b/build/win32/include/config.h index b4c77854cd5..2f87cf5e8c5 100644 --- a/build/win32/include/config.h +++ b/build/win32/include/config.h @@ -76,5 +76,5 @@ /* define to 1 if you have the <errno.h> header file */ #define HAVE_ERRNO_H 1 -/* Define to 1 if you have the <pcreposix.h> header file. */ -#define HAVE_PCREPOSIX_H 1 +/* Define to 1 if you have the <pcre.h> header file. */ +#define HAVE_PCRE_H 1 diff --git a/build/win32/project/Makefile_pcre.inc b/build/win32/project/Makefile_pcre.inc index 62b78e6b602..96b0b0cc553 100644 --- a/build/win32/project/Makefile_pcre.inc +++ b/build/win32/project/Makefile_pcre.inc @@ -6,24 +6,17 @@ ! ERROR Please specify PCRELIBDIR (e. g. PCRELIBDIR=\somepath\lib). ! ENDIF -! IF EXISTS("$(PCREINCDIR)\pcreposix.h") +! IF EXISTS("$(PCREINCDIR)\pcre.h") CFLAGS = $(CFLAGS) /DPCRE_STATIC INCS = $(INCS) /I "$(PCREINCDIR)" ! ELSE -! ERROR PCREINCDIR "$(PCREINCDIR)" cannot find "$(PCREINCDIR)\pcreposix.h" +! ERROR PCREINCDIR "$(PCREINCDIR)" cannot find "$(PCREINCDIR)\pcre.h" ! ENDIF PCRELIB = $(PCRELIBDIR)\pcre.lib -PCREPOSIXLIB = $(PCRELIBDIR)\pcreposix.lib ! IF EXISTS("$(PCRELIB)") LIBS = $(LIBS) "$(PCRELIB)" ! ELSE ! ERROR PCRELIBDIR "$(PCRELIBDIR)" cannot find PCRELIB "$(PCRELIB)" ! ENDIF - -! IF EXISTS("$(PCREPOSIXLIB)") -LIBS = $(LIBS) "$(PCREPOSIXLIB)" -! ELSE -! ERROR PCRELIBDIR "$(PCRELIBDIR)" cannot find PCREPOSIXLIB "$(PCREPOSIXLIB)" -! ENDIF |