diff options
| author | Nick Wellnhofer <wellnhofer@aevum.de> | 2017-11-13 17:08:38 +0100 |
|---|---|---|
| committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2017-11-27 14:33:37 +0100 |
| commit | cb5541c9f34fc29b0d7b8d89a3122c3fa46a6068 (patch) | |
| tree | c4a39229b4a2bc71bd19548a3762cf85c9c21f2d /win32 | |
| parent | ddbb075b70abdc8166f878f039c5efd27a9df3e0 (diff) | |
| download | libxml2-cb5541c9f34fc29b0d7b8d89a3122c3fa46a6068.tar.gz | |
Fix libz and liblzma detection
If libz or liblzma are detected with pkg-config, AC_CHECK_HEADERS must
not be run because the correct CPPFLAGS aren't set. It is actually not
required have separate checks for LIBXML_ZLIB_ENABLED and HAVE_ZLIB_H.
Only check for LIBXML_ZLIB_ENABLED and remove HAVE_ZLIB_H macro.
Fixes bug 764657, bug 787041.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.bcb | 6 | ||||
| -rw-r--r-- | win32/Makefile.mingw | 6 | ||||
| -rw-r--r-- | win32/Makefile.msvc | 6 |
3 files changed, 0 insertions, 18 deletions
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb index 7129c617..41002da5 100644 --- a/win32/Makefile.bcb +++ b/win32/Makefile.bcb @@ -65,12 +65,6 @@ CFLAGS = $(CFLAGS) -DHAVE_WIN32_THREADS !else if "$(WITH_THREADS)" == "posix" CFLAGS = $(CFLAGS) -DHAVE_PTHREAD_H !endif -!if "$(WITH_ZLIB)" == "1" -CFLAGS = $(CFLAGS) -DHAVE_ZLIB_H -!endif -!if "$(WITH_LZMA)" == "1" -CFLAGS = $(CFLAGS) -DHAVE_LZMA_H -!endif # The linker and its options. LD = ilink32.exe diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw index f579923a..3d4cb888 100644 --- a/win32/Makefile.mingw +++ b/win32/Makefile.mingw @@ -57,12 +57,6 @@ endif ifeq ($(WITH_THREADS),posix) CFLAGS += -DHAVE_PTHREAD_H endif -ifeq ($(WITH_ZLIB),1) -CFLAGS += -DHAVE_ZLIB_H -endif -ifeq ($(WITH_LZMA),1) -CFLAGS += -DHAVE_LZMA_H -endif # The linker and its options. LD = gcc.exe diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 115a4517..ff8378e2 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -55,12 +55,6 @@ CFLAGS = $(CFLAGS) /D "HAVE_WIN32_THREADS" !else if "$(WITH_THREADS)" == "posix" CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H" !endif -!if "$(WITH_ZLIB)" == "1" -CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H" -!endif -!if "$(WITH_LZMA)" == "1" -CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H" -!endif CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE # The linker and its options. |