need to conditionally compile based on the availability of zlib

This commit is contained in:
Cristy
2025-07-13 13:03:33 -04:00
parent a18c2a830c
commit e779f7aadf
4 changed files with 8 additions and 5 deletions
+3 -2
View File
@@ -1713,7 +1713,8 @@ coders_sct_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(coders_sct_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_MODULES_TRUE@am_coders_sct_la_rpath = -rpath $(codersdir)
coders_sf3_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
coders_sf3_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_coders_sf3_la_OBJECTS = coders/sf3_la-sf3.lo
coders_sf3_la_OBJECTS = $(am_coders_sf3_la_OBJECTS)
coders_sf3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -5014,7 +5015,7 @@ coders_sct_la_LIBADD = $(MAGICKCORE_LIBS)
coders_sf3_la_SOURCES = coders/sf3.c
coders_sf3_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
coders_sf3_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_sf3_la_LIBADD = $(MAGICKCORE_LIBS)
coders_sf3_la_LIBADD = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
# SFW coder module
coders_sfw_la_SOURCES = coders/sfw.c
+1 -1
View File
@@ -1313,7 +1313,7 @@ coders_sct_la_LIBADD = $(MAGICKCORE_LIBS)
coders_sf3_la_SOURCES = coders/sf3.c
coders_sf3_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
coders_sf3_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_sf3_la_LIBADD = $(MAGICKCORE_LIBS)
coders_sf3_la_LIBADD = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
# SFW coder module
coders_sfw_la_SOURCES = coders/sfw.c
+3 -1
View File
@@ -58,7 +58,9 @@
#include "MagickCore/static.h"
#include "MagickCore/string_.h"
#include "MagickCore/module.h"
#include <zlib.h>
#if defined(MAGICKCORE_ZLIB_DELEGATE)
#include "zlib.h"
#endif
/*
Enumerated declarations.
Vendored
+1 -1
View File
@@ -5371,7 +5371,7 @@ MAGICK_PATCHLEVEL_VERSION=1
MAGICK_VERSION=7.1.2-1
MAGICK_GIT_REVISION=c38b1e46c:20250713
MAGICK_GIT_REVISION=a18c2a830:20250713
# Substitute library versioning