From: =?utf-8?q?Bastien_Roucari=C3=A8s?= Date: Sat, 31 Aug 2024 20:52:19 +0000 Subject: Push IM7 flags Forwarded: not needed --- Make.def.in | 1 + Make.rules | 6 +++--- configure.ac | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) --- a/Make.def.in +++ b/Make.def.in @@ -68,6 +68,7 @@ MAGICK_CFLAGS = @MAGICK_CFLAGS@ WAND_CFLAGS = @WAND_CFLAGS@ WAND_LIBS = @WAND_LIBS@ +CFLAGS_IMAGEMAGICK67 = @CFLAGS_IMAGEMAGICK67@ # Java include directories JAVA_INCLUDES = @JAVA_INCLUDES@ --- a/Make.rules +++ b/Make.rules @@ -148,11 +148,11 @@ # Rule to compile JNI C files $(PACKAGE_OBJ_DIR)/%.lo: %.c $(PACKAGE_GENERATED_INPUT_DIR)/%.h @-mkdir -p $(dir $@) - $(LIBTOOL) --mode=compile $(CC) -I$(PACKAGE_GENERATED_INPUT_DIR) $(CFLAGS) $(MAGICK_CFLAGS) $(WAND_CFLAGS) -c $< -o $@ + $(LIBTOOL) --mode=compile $(CC) -I$(PACKAGE_GENERATED_INPUT_DIR) $(CFLAGS) $(MAGICK_CFLAGS) $(WAND_CFLAGS) $(CFLAGS_IMAGEMAGICK67) -c $< -o $@ $(PACKAGE_OBJ_DIR)/%.lo: %.c @-mkdir -p $(dir $@) - $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(MAGICK_CFLAGS) $(WAND_CFLAGS) -c $< -o $@ + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(MAGICK_CFLAGS) $(WAND_CFLAGS) $(CFLAGS_IMAGEMAGICK67) -c $< -o $@ # Rule to generate autodependencies in the case where JNI is used. JNI_DEP_FILE = .jnidep @@ -160,7 +160,7 @@ @case $(CC) in \ *gcc) \ echo Autogenerating C dependencies.; \ - $(CC) -M $(CFLAGS) -I$(PACKAGE_GENERATED_INPUT_DIR) \ + $(CC) -M $(CFLAGS) $(CFLAGS_IMAGEMAGICK67) $(WAND_FLAGS) $(MAGICK_CFLAGS) -I$(PACKAGE_GENERATED_INPUT_DIR) \ $(JNI_IMPL) > .jnidep.tmp; \ sed -e "s;\(.*\)\.o:;$(PACKAGE_OBJ_DIR)/\1.lo:;" \ < .jnidep.tmp > $@; \ --- a/configure.ac +++ b/configure.ac @@ -283,6 +283,8 @@ WAND_CFLAGS="`$PKG_CONFIG --cflags MagickWand`" MAGICK_VERSION="`$PKG_CONFIG --modversion MagickWand | perl -pe 's/(^\d+)\..*$/$1/g'`" AS_IF(test $MAGICK_VERSION = 7,AC_DEFINE(IMAGEMAGICK_HEADER_STYLE_7)) +AS_IF(test $MAGICK_VERSION = 7,AC_DEFINE(CFLAGS_IMAGEMAGICK67,-DIMAGEMAGICK_HEADER_STYLE_7=1)) +AS_IF(test $MAGICK_VERSION = 7,CFLAGS_IMAGEMAGICK67="-DIMAGEMAGICK_HEADER_STYLE_7=1") HAVE_MAGICK_LIB='yes'; @@ -290,6 +292,7 @@ AC_DISABLE_STATIC LT_INIT +AC_SUBST(CFLAGS_IMAGEMAGICK67) AC_SUBST(JAVA_INCLUDES) AC_SUBST(X11_LIBS) AC_SUBST(X11_INCLUDES)