Updated to version 2.0.4
authorSam Lantinga <slouken@libsdl.org>
Fri, 26 Oct 2018 10:07:53 -0700
changeset 615923efa629d1c
parent 614 fa3c53a205a9
child 616 77ea31fee372
Updated to version 2.0.4
CHANGES.txt
Makefile.in
SDL2_image.spec
SDL_image.h
VisualC/Version.rc
VisualCE/Version.rc
Xcode/Info-Framework.plist
Xcode/SDL_image.xcodeproj/project.pbxproj
aclocal.m4
configure
configure.in
debian/changelog
version.rc
     1.1 --- a/CHANGES.txt	Tue Oct 23 23:00:50 2018 +0300
     1.2 +++ b/CHANGES.txt	Fri Oct 26 10:07:53 2018 -0700
     1.3 @@ -1,3 +1,9 @@
     1.4 +2.0.4:
     1.5 +MichaƂ Janiszewski - Fri Sept 28 22:00:26 PST 2018
     1.6 + * Fixed memory issues in the XCF loader
     1.7 +Ryan Gordon - Wed Sept 26 14:58:31 PST 2018
     1.8 + * Fixed a number of security issues, including TALOS-2018-0645
     1.9 +
    1.10  2.0.3:
    1.11  Ryan Gordon - Sun Jan 28 21:28:16 PST 2018
    1.12   * Fixed a number of security issues:
     2.1 --- a/Makefile.in	Tue Oct 23 23:00:50 2018 +0300
     2.2 +++ b/Makefile.in	Fri Oct 26 10:07:53 2018 -0700
     2.3 @@ -1,7 +1,7 @@
     2.4 -# Makefile.in generated by automake 1.14 from Makefile.am.
     2.5 +# Makefile.in generated by automake 1.16 from Makefile.am.
     2.6  # @configure_input@
     2.7  
     2.8 -# Copyright (C) 1994-2013 Free Software Foundation, Inc.
     2.9 +# Copyright (C) 1994-2018 Free Software Foundation, Inc.
    2.10  
    2.11  # This Makefile.in is free software; the Free Software Foundation
    2.12  # gives unlimited permission to copy and/or distribute it,
    2.13 @@ -20,7 +20,17 @@
    2.14  
    2.15  
    2.16  VPATH = @srcdir@
    2.17 -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
    2.18 +am__is_gnu_make = { \
    2.19 +  if test -z '$(MAKELEVEL)'; then \
    2.20 +    false; \
    2.21 +  elif test -n '$(MAKE_HOST)'; then \
    2.22 +    true; \
    2.23 +  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
    2.24 +    true; \
    2.25 +  else \
    2.26 +    false; \
    2.27 +  fi; \
    2.28 +}
    2.29  am__make_running_with_option = \
    2.30    case $${target_option-} in \
    2.31        ?) ;; \
    2.32 @@ -87,11 +97,6 @@
    2.33  @USE_VERSION_RC_FALSE@	$(am__DEPENDENCIES_1)
    2.34  noinst_PROGRAMS = showimage$(EXEEXT)
    2.35  subdir = .
    2.36 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
    2.37 -	$(top_srcdir)/configure $(am__configure_deps) \
    2.38 -	$(srcdir)/SDL2_image.spec.in $(srcdir)/SDL2_image.pc.in \
    2.39 -	depcomp $(libSDL2_imageinclude_HEADERS) compile config.guess \
    2.40 -	config.sub install-sh missing ltmain.sh
    2.41  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    2.42  am__aclocal_m4_deps = $(top_srcdir)/acinclude/libtool.m4 \
    2.43  	$(top_srcdir)/acinclude/ltoptions.m4 \
    2.44 @@ -102,11 +107,15 @@
    2.45  	$(top_srcdir)/configure.in
    2.46  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    2.47  	$(ACLOCAL_M4)
    2.48 +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
    2.49 +	$(am__configure_deps) $(libSDL2_imageinclude_HEADERS) \
    2.50 +	$(am__DIST_COMMON)
    2.51  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
    2.52   configure.lineno config.status.lineno
    2.53  mkinstalldirs = $(install_sh) -d
    2.54  CONFIG_CLEAN_FILES = SDL2_image.spec SDL2_image.pc
    2.55  CONFIG_CLEAN_VPATH_FILES =
    2.56 +PROGRAMS = $(noinst_PROGRAMS)
    2.57  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    2.58  am__vpath_adj = case $$p in \
    2.59      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    2.60 @@ -155,7 +164,6 @@
    2.61  libSDL2_image_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
    2.62  	$(LIBTOOLFLAGS) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \
    2.63  	$(OBJCFLAGS) $(libSDL2_image_la_LDFLAGS) $(LDFLAGS) -o $@
    2.64 -PROGRAMS = $(noinst_PROGRAMS)
    2.65  showimage_SOURCES = showimage.c
    2.66  showimage_OBJECTS = showimage.$(OBJEXT)
    2.67  showimage_DEPENDENCIES = libSDL2_image.la
    2.68 @@ -173,7 +181,16 @@
    2.69  am__v_at_1 = 
    2.70  DEFAULT_INCLUDES = -I.@am__isrc@
    2.71  depcomp = $(SHELL) $(top_srcdir)/depcomp
    2.72 -am__depfiles_maybe = depfiles
    2.73 +am__maybe_remake_depfiles = depfiles
    2.74 +am__depfiles_remade = ./$(DEPDIR)/IMG.Plo ./$(DEPDIR)/IMG_ImageIO.Plo \
    2.75 +	./$(DEPDIR)/IMG_WIC.Plo ./$(DEPDIR)/IMG_bmp.Plo \
    2.76 +	./$(DEPDIR)/IMG_gif.Plo ./$(DEPDIR)/IMG_jpg.Plo \
    2.77 +	./$(DEPDIR)/IMG_lbm.Plo ./$(DEPDIR)/IMG_pcx.Plo \
    2.78 +	./$(DEPDIR)/IMG_png.Plo ./$(DEPDIR)/IMG_pnm.Plo \
    2.79 +	./$(DEPDIR)/IMG_svg.Plo ./$(DEPDIR)/IMG_tga.Plo \
    2.80 +	./$(DEPDIR)/IMG_tif.Plo ./$(DEPDIR)/IMG_webp.Plo \
    2.81 +	./$(DEPDIR)/IMG_xcf.Plo ./$(DEPDIR)/IMG_xpm.Plo \
    2.82 +	./$(DEPDIR)/IMG_xv.Plo ./$(DEPDIR)/showimage.Po
    2.83  am__mv = mv -f
    2.84  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    2.85  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2.86 @@ -241,6 +258,9 @@
    2.87  CTAGS = ctags
    2.88  CSCOPE = cscope
    2.89  AM_RECURSIVE_TARGETS = cscope
    2.90 +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/SDL2_image.pc.in \
    2.91 +	$(srcdir)/SDL2_image.spec.in compile config.guess config.sub \
    2.92 +	depcomp install-sh ltmain.sh missing
    2.93  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    2.94  distdir = $(PACKAGE)-$(VERSION)
    2.95  top_distdir = $(distdir)
    2.96 @@ -475,15 +495,14 @@
    2.97  	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
    2.98  	$(am__cd) $(top_srcdir) && \
    2.99  	  $(AUTOMAKE) --foreign Makefile
   2.100 -.PRECIOUS: Makefile
   2.101  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   2.102  	@case '$?' in \
   2.103  	  *config.status*) \
   2.104  	    echo ' $(SHELL) ./config.status'; \
   2.105  	    $(SHELL) ./config.status;; \
   2.106  	  *) \
   2.107 -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
   2.108 -	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
   2.109 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
   2.110 +	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
   2.111  	esac;
   2.112  
   2.113  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   2.114 @@ -499,6 +518,15 @@
   2.115  SDL2_image.pc: $(top_builddir)/config.status $(srcdir)/SDL2_image.pc.in
   2.116  	cd $(top_builddir) && $(SHELL) ./config.status $@
   2.117  
   2.118 +clean-noinstPROGRAMS:
   2.119 +	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
   2.120 +	echo " rm -f" $$list; \
   2.121 +	rm -f $$list || exit $$?; \
   2.122 +	test -n "$(EXEEXT)" || exit 0; \
   2.123 +	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
   2.124 +	echo " rm -f" $$list; \
   2.125 +	rm -f $$list
   2.126 +
   2.127  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
   2.128  	@$(NORMAL_INSTALL)
   2.129  	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
   2.130 @@ -537,15 +565,6 @@
   2.131  libSDL2_image.la: $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_DEPENDENCIES) $(EXTRA_libSDL2_image_la_DEPENDENCIES) 
   2.132  	$(AM_V_OBJCLD)$(libSDL2_image_la_LINK) -rpath $(libdir) $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_LIBADD) $(LIBS)
   2.133  
   2.134 -clean-noinstPROGRAMS:
   2.135 -	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
   2.136 -	echo " rm -f" $$list; \
   2.137 -	rm -f $$list || exit $$?; \
   2.138 -	test -n "$(EXEEXT)" || exit 0; \
   2.139 -	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
   2.140 -	echo " rm -f" $$list; \
   2.141 -	rm -f $$list
   2.142 -
   2.143  showimage$(EXEEXT): $(showimage_OBJECTS) $(showimage_DEPENDENCIES) $(EXTRA_showimage_DEPENDENCIES) 
   2.144  	@rm -f showimage$(EXEEXT)
   2.145  	$(AM_V_CCLD)$(LINK) $(showimage_OBJECTS) $(showimage_LDADD) $(LIBS)
   2.146 @@ -556,24 +575,30 @@
   2.147  distclean-compile:
   2.148  	-rm -f *.tab.c
   2.149  
   2.150 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG.Plo@am__quote@
   2.151 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_ImageIO.Plo@am__quote@
   2.152 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_WIC.Plo@am__quote@
   2.153 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_bmp.Plo@am__quote@
   2.154 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_gif.Plo@am__quote@
   2.155 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_jpg.Plo@am__quote@
   2.156 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_lbm.Plo@am__quote@
   2.157 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pcx.Plo@am__quote@
   2.158 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_png.Plo@am__quote@
   2.159 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pnm.Plo@am__quote@
   2.160 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_svg.Plo@am__quote@
   2.161 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tga.Plo@am__quote@
   2.162 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tif.Plo@am__quote@
   2.163 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_webp.Plo@am__quote@
   2.164 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xcf.Plo@am__quote@
   2.165 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xpm.Plo@am__quote@
   2.166 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xv.Plo@am__quote@
   2.167 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showimage.Po@am__quote@
   2.168 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG.Plo@am__quote@ # am--include-marker
   2.169 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_ImageIO.Plo@am__quote@ # am--include-marker
   2.170 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_WIC.Plo@am__quote@ # am--include-marker
   2.171 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_bmp.Plo@am__quote@ # am--include-marker
   2.172 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_gif.Plo@am__quote@ # am--include-marker
   2.173 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_jpg.Plo@am__quote@ # am--include-marker
   2.174 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_lbm.Plo@am__quote@ # am--include-marker
   2.175 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pcx.Plo@am__quote@ # am--include-marker
   2.176 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_png.Plo@am__quote@ # am--include-marker
   2.177 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_pnm.Plo@am__quote@ # am--include-marker
   2.178 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_svg.Plo@am__quote@ # am--include-marker
   2.179 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tga.Plo@am__quote@ # am--include-marker
   2.180 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_tif.Plo@am__quote@ # am--include-marker
   2.181 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_webp.Plo@am__quote@ # am--include-marker
   2.182 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xcf.Plo@am__quote@ # am--include-marker
   2.183 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xpm.Plo@am__quote@ # am--include-marker
   2.184 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xv.Plo@am__quote@ # am--include-marker
   2.185 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showimage.Po@am__quote@ # am--include-marker
   2.186 +
   2.187 +$(am__depfiles_remade):
   2.188 +	@$(MKDIR_P) $(@D)
   2.189 +	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
   2.190 +
   2.191 +am--depfiles: $(am__depfiles_remade)
   2.192  
   2.193  .c.o:
   2.194  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   2.195 @@ -727,7 +752,10 @@
   2.196  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
   2.197  	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
   2.198  
   2.199 -distdir: $(DISTFILES)
   2.200 +distdir: $(BUILT_SOURCES)
   2.201 +	$(MAKE) $(AM_MAKEFLAGS) distdir-am
   2.202 +
   2.203 +distdir-am: $(DISTFILES)
   2.204  	$(am__remove_distdir)
   2.205  	test -d "$(distdir)" || mkdir "$(distdir)"
   2.206  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   2.207 @@ -767,7 +795,7 @@
   2.208  	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
   2.209  	|| chmod -R a+r "$(distdir)"
   2.210  dist-gzip: distdir
   2.211 -	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
   2.212 +	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
   2.213  	$(am__post_remove_distdir)
   2.214  
   2.215  dist-bzip2: distdir
   2.216 @@ -783,17 +811,17 @@
   2.217  	$(am__post_remove_distdir)
   2.218  
   2.219  dist-tarZ: distdir
   2.220 -	@echo WARNING: "Support for shar distribution archives is" \
   2.221 -	               "deprecated." >&2
   2.222 +	@echo WARNING: "Support for distribution archives compressed with" \
   2.223 +		       "legacy program 'compress' is deprecated." >&2
   2.224  	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
   2.225  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
   2.226  	$(am__post_remove_distdir)
   2.227  
   2.228  dist-shar: distdir
   2.229 -	@echo WARNING: "Support for distribution archives compressed with" \
   2.230 -		       "legacy program 'compress' is deprecated." >&2
   2.231 +	@echo WARNING: "Support for shar distribution archives is" \
   2.232 +	               "deprecated." >&2
   2.233  	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
   2.234 -	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
   2.235 +	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
   2.236  	$(am__post_remove_distdir)
   2.237  
   2.238  dist-zip: distdir
   2.239 @@ -811,7 +839,7 @@
   2.240  distcheck: dist
   2.241  	case '$(DIST_ARCHIVES)' in \
   2.242  	*.tar.gz*) \
   2.243 -	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
   2.244 +	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
   2.245  	*.tar.bz2*) \
   2.246  	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
   2.247  	*.tar.lz*) \
   2.248 @@ -821,22 +849,23 @@
   2.249  	*.tar.Z*) \
   2.250  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
   2.251  	*.shar.gz*) \
   2.252 -	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
   2.253 +	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
   2.254  	*.zip*) \
   2.255  	  unzip $(distdir).zip ;;\
   2.256  	esac
   2.257  	chmod -R a-w $(distdir)
   2.258  	chmod u+w $(distdir)
   2.259 -	mkdir $(distdir)/_build $(distdir)/_inst
   2.260 +	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
   2.261  	chmod a-w $(distdir)
   2.262  	test -d $(distdir)/_build || exit 0; \
   2.263  	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
   2.264  	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
   2.265  	  && am__cwd=`pwd` \
   2.266 -	  && $(am__cd) $(distdir)/_build \
   2.267 -	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
   2.268 +	  && $(am__cd) $(distdir)/_build/sub \
   2.269 +	  && ../../configure \
   2.270  	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
   2.271  	    $(DISTCHECK_CONFIGURE_FLAGS) \
   2.272 +	    --srcdir=../.. --prefix="$$dc_install_base" \
   2.273  	  && $(MAKE) $(AM_MAKEFLAGS) \
   2.274  	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
   2.275  	  && $(MAKE) $(AM_MAKEFLAGS) check \
   2.276 @@ -891,7 +920,7 @@
   2.277  	       exit 1; } >&2
   2.278  check-am: all-am
   2.279  check: check-am
   2.280 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
   2.281 +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS)
   2.282  installdirs:
   2.283  	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libSDL2_imageincludedir)"; do \
   2.284  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
   2.285 @@ -933,7 +962,24 @@
   2.286  
   2.287  distclean: distclean-am
   2.288  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
   2.289 -	-rm -rf ./$(DEPDIR)
   2.290 +		-rm -f ./$(DEPDIR)/IMG.Plo
   2.291 +	-rm -f ./$(DEPDIR)/IMG_ImageIO.Plo
   2.292 +	-rm -f ./$(DEPDIR)/IMG_WIC.Plo
   2.293 +	-rm -f ./$(DEPDIR)/IMG_bmp.Plo
   2.294 +	-rm -f ./$(DEPDIR)/IMG_gif.Plo
   2.295 +	-rm -f ./$(DEPDIR)/IMG_jpg.Plo
   2.296 +	-rm -f ./$(DEPDIR)/IMG_lbm.Plo
   2.297 +	-rm -f ./$(DEPDIR)/IMG_pcx.Plo
   2.298 +	-rm -f ./$(DEPDIR)/IMG_png.Plo
   2.299 +	-rm -f ./$(DEPDIR)/IMG_pnm.Plo
   2.300 +	-rm -f ./$(DEPDIR)/IMG_svg.Plo
   2.301 +	-rm -f ./$(DEPDIR)/IMG_tga.Plo
   2.302 +	-rm -f ./$(DEPDIR)/IMG_tif.Plo
   2.303 +	-rm -f ./$(DEPDIR)/IMG_webp.Plo
   2.304 +	-rm -f ./$(DEPDIR)/IMG_xcf.Plo
   2.305 +	-rm -f ./$(DEPDIR)/IMG_xpm.Plo
   2.306 +	-rm -f ./$(DEPDIR)/IMG_xv.Plo
   2.307 +	-rm -f ./$(DEPDIR)/showimage.Po
   2.308  	-rm -f Makefile
   2.309  distclean-am: clean-am distclean-compile distclean-generic \
   2.310  	distclean-libtool distclean-tags
   2.311 @@ -982,7 +1028,24 @@
   2.312  maintainer-clean: maintainer-clean-am
   2.313  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
   2.314  	-rm -rf $(top_srcdir)/autom4te.cache
   2.315 -	-rm -rf ./$(DEPDIR)
   2.316 +		-rm -f ./$(DEPDIR)/IMG.Plo
   2.317 +	-rm -f ./$(DEPDIR)/IMG_ImageIO.Plo
   2.318 +	-rm -f ./$(DEPDIR)/IMG_WIC.Plo
   2.319 +	-rm -f ./$(DEPDIR)/IMG_bmp.Plo
   2.320 +	-rm -f ./$(DEPDIR)/IMG_gif.Plo
   2.321 +	-rm -f ./$(DEPDIR)/IMG_jpg.Plo
   2.322 +	-rm -f ./$(DEPDIR)/IMG_lbm.Plo
   2.323 +	-rm -f ./$(DEPDIR)/IMG_pcx.Plo
   2.324 +	-rm -f ./$(DEPDIR)/IMG_png.Plo
   2.325 +	-rm -f ./$(DEPDIR)/IMG_pnm.Plo
   2.326 +	-rm -f ./$(DEPDIR)/IMG_svg.Plo
   2.327 +	-rm -f ./$(DEPDIR)/IMG_tga.Plo
   2.328 +	-rm -f ./$(DEPDIR)/IMG_tif.Plo
   2.329 +	-rm -f ./$(DEPDIR)/IMG_webp.Plo
   2.330 +	-rm -f ./$(DEPDIR)/IMG_xcf.Plo
   2.331 +	-rm -f ./$(DEPDIR)/IMG_xpm.Plo
   2.332 +	-rm -f ./$(DEPDIR)/IMG_xv.Plo
   2.333 +	-rm -f ./$(DEPDIR)/showimage.Po
   2.334  	-rm -f Makefile
   2.335  maintainer-clean-am: distclean-am maintainer-clean-generic
   2.336  
   2.337 @@ -1004,17 +1067,17 @@
   2.338  
   2.339  .MAKE: install-am install-strip
   2.340  
   2.341 -.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
   2.342 -	clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
   2.343 -	clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \
   2.344 -	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
   2.345 -	dist-xz dist-zip distcheck distclean distclean-compile \
   2.346 -	distclean-generic distclean-libtool distclean-tags \
   2.347 -	distcleancheck distdir distuninstallcheck dvi dvi-am html \
   2.348 -	html-am info info-am install install-am install-data \
   2.349 -	install-data-am install-dvi install-dvi-am install-exec \
   2.350 -	install-exec-am install-html install-html-am install-info \
   2.351 -	install-info-am install-libLTLIBRARIES \
   2.352 +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
   2.353 +	check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \
   2.354 +	clean-libtool clean-noinstPROGRAMS cscope cscopelist-am ctags \
   2.355 +	ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
   2.356 +	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
   2.357 +	distclean-compile distclean-generic distclean-libtool \
   2.358 +	distclean-tags distcleancheck distdir distuninstallcheck dvi \
   2.359 +	dvi-am html html-am info info-am install install-am \
   2.360 +	install-data install-data-am install-dvi install-dvi-am \
   2.361 +	install-exec install-exec-am install-html install-html-am \
   2.362 +	install-info install-info-am install-libLTLIBRARIES \
   2.363  	install-libSDL2_imageincludeHEADERS install-man install-pdf \
   2.364  	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
   2.365  	install-strip installcheck installcheck-am installdirs \
   2.366 @@ -1024,6 +1087,8 @@
   2.367  	uninstall-libLTLIBRARIES uninstall-libSDL2_imageincludeHEADERS \
   2.368  	uninstall-pkgconfigDATA
   2.369  
   2.370 +.PRECIOUS: Makefile
   2.371 +
   2.372  
   2.373  %.o : %.rc
   2.374  	$(WINDRES) $< $@
     3.1 --- a/SDL2_image.spec	Tue Oct 23 23:00:50 2018 +0300
     3.2 +++ b/SDL2_image.spec	Fri Oct 26 10:07:53 2018 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  %define name SDL2_image
     3.5 -%define version 2.0.3
     3.6 +%define version 2.0.4
     3.7  %define release 1
     3.8  
     3.9  Summary: Simple DirectMedia Layer - Sample Image Loading Library
     4.1 --- a/SDL_image.h	Tue Oct 23 23:00:50 2018 +0300
     4.2 +++ b/SDL_image.h	Fri Oct 26 10:07:53 2018 -0700
     4.3 @@ -37,7 +37,7 @@
     4.4  */
     4.5  #define SDL_IMAGE_MAJOR_VERSION 2
     4.6  #define SDL_IMAGE_MINOR_VERSION 0
     4.7 -#define SDL_IMAGE_PATCHLEVEL    3
     4.8 +#define SDL_IMAGE_PATCHLEVEL    4
     4.9  
    4.10  /* This macro can be used to fill a version structure with the compile-time
    4.11   * version of the SDL_image library.
     5.1 --- a/VisualC/Version.rc	Tue Oct 23 23:00:50 2018 +0300
     5.2 +++ b/VisualC/Version.rc	Fri Oct 26 10:07:53 2018 -0700
     5.3 @@ -28,8 +28,8 @@
     5.4  //
     5.5  
     5.6  VS_VERSION_INFO VERSIONINFO
     5.7 - FILEVERSION 2,0,3,0
     5.8 - PRODUCTVERSION 2,0,3,0
     5.9 + FILEVERSION 2,0,4,0
    5.10 + PRODUCTVERSION 2,0,4,0
    5.11   FILEFLAGSMASK 0x3fL
    5.12  #ifdef _DEBUG
    5.13   FILEFLAGS 0x1L
    5.14 @@ -46,12 +46,12 @@
    5.15          BEGIN
    5.16              VALUE "CompanyName", "\0"
    5.17              VALUE "FileDescription", "SDL_image\0"
    5.18 -            VALUE "FileVersion", "2, 0, 3, 0\0"
    5.19 +            VALUE "FileVersion", "2, 0, 4, 0\0"
    5.20              VALUE "InternalName", "SDL_image\0"
    5.21              VALUE "LegalCopyright", "Copyright © 2018 Sam Lantinga\0"
    5.22              VALUE "OriginalFilename", "SDL_image.dll\0"
    5.23              VALUE "ProductName", "Simple DirectMedia Layer\0"
    5.24 -            VALUE "ProductVersion", "2, 0, 3, 0\0"
    5.25 +            VALUE "ProductVersion", "2, 0, 4, 0\0"
    5.26          END
    5.27      END
    5.28      BLOCK "VarFileInfo"
     6.1 --- a/VisualCE/Version.rc	Tue Oct 23 23:00:50 2018 +0300
     6.2 +++ b/VisualCE/Version.rc	Fri Oct 26 10:07:53 2018 -0700
     6.3 @@ -29,8 +29,8 @@
     6.4  //
     6.5  
     6.6  VS_VERSION_INFO VERSIONINFO
     6.7 - FILEVERSION 2,0,1,0
     6.8 - PRODUCTVERSION 2,0,1,0
     6.9 + FILEVERSION 2,0,4,0
    6.10 + PRODUCTVERSION 2,0,4,0
    6.11   FILEFLAGSMASK 0x3fL
    6.12  #ifdef _DEBUG
    6.13   FILEFLAGS 0x1L
    6.14 @@ -47,12 +47,12 @@
    6.15          BEGIN
    6.16              VALUE "CompanyName", "\0"
    6.17              VALUE "FileDescription", "SDL_image\0"
    6.18 -            VALUE "FileVersion", "2, 0, 1, 0\0"
    6.19 +            VALUE "FileVersion", "2, 0, 4, 0\0"
    6.20              VALUE "InternalName", "SDL_image\0"
    6.21              VALUE "LegalCopyright", "Copyright © 2018 Sam Lantinga\0"
    6.22              VALUE "OriginalFilename", "SDL_image.dll\0"
    6.23              VALUE "ProductName", "Simple DirectMedia Layer\0"
    6.24 -            VALUE "ProductVersion", "2, 0, 1, 0\0"
    6.25 +            VALUE "ProductVersion", "2, 0, 4, 0\0"
    6.26          END
    6.27      END
    6.28      BLOCK "VarFileInfo"
     7.1 --- a/Xcode/Info-Framework.plist	Tue Oct 23 23:00:50 2018 +0300
     7.2 +++ b/Xcode/Info-Framework.plist	Fri Oct 26 10:07:53 2018 -0700
     7.3 @@ -15,8 +15,8 @@
     7.4  	<key>CFBundlePackageType</key>
     7.5  	<string>FMWK</string>
     7.6  	<key>CFBundleShortVersionString</key>
     7.7 -	<string>2.0.3</string>
     7.8 +	<string>2.0.4</string>
     7.9  	<key>CFBundleVersion</key>
    7.10 -	<string>2.0.3</string>
    7.11 +	<string>2.0.4</string>
    7.12  </dict>
    7.13  </plist>
     8.1 --- a/Xcode/SDL_image.xcodeproj/project.pbxproj	Tue Oct 23 23:00:50 2018 +0300
     8.2 +++ b/Xcode/SDL_image.xcodeproj/project.pbxproj	Fri Oct 26 10:07:53 2018 -0700
     8.3 @@ -509,8 +509,8 @@
     8.4  			isa = XCBuildConfiguration;
     8.5  			buildSettings = {
     8.6  				COMBINE_HIDPI_IMAGES = YES;
     8.7 -				DYLIB_COMPATIBILITY_VERSION = 1;
     8.8 -				DYLIB_CURRENT_VERSION = 3.1.0;
     8.9 +				DYLIB_COMPATIBILITY_VERSION = 3.0.0;
    8.10 +				DYLIB_CURRENT_VERSION = 3.2.0;
    8.11  				FRAMEWORK_SEARCH_PATHS = (
    8.12  					"$(inherited)",
    8.13  					"\"$(SRCROOT)/Frameworks\"",
    8.14 @@ -634,8 +634,8 @@
    8.15  			isa = XCBuildConfiguration;
    8.16  			buildSettings = {
    8.17  				COMBINE_HIDPI_IMAGES = YES;
    8.18 -				DYLIB_COMPATIBILITY_VERSION = 1;
    8.19 -				DYLIB_CURRENT_VERSION = 3.1.0;
    8.20 +				DYLIB_COMPATIBILITY_VERSION = 3.0.0;
    8.21 +				DYLIB_CURRENT_VERSION = 3.2.0;
    8.22  				FRAMEWORK_SEARCH_PATHS = (
    8.23  					"$(inherited)",
    8.24  					"\"$(SRCROOT)/Frameworks\"",
     9.1 --- a/aclocal.m4	Tue Oct 23 23:00:50 2018 +0300
     9.2 +++ b/aclocal.m4	Fri Oct 26 10:07:53 2018 -0700
     9.3 @@ -1,6 +1,6 @@
     9.4 -# generated automatically by aclocal 1.14 -*- Autoconf -*-
     9.5 +# generated automatically by aclocal 1.16 -*- Autoconf -*-
     9.6  
     9.7 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
     9.8 +# Copyright (C) 1996-2018 Free Software Foundation, Inc.
     9.9  
    9.10  # This file is free software; the Free Software Foundation
    9.11  # gives unlimited permission to copy and/or distribute it,
    9.12 @@ -20,7 +20,7 @@
    9.13  If you have problems, you may need to regenerate the build system entirely.
    9.14  To do so, use the procedure documented by the package, typically 'autoreconf'.])])
    9.15  
    9.16 -# Copyright (C) 2002-2013 Free Software Foundation, Inc.
    9.17 +# Copyright (C) 2002-2018 Free Software Foundation, Inc.
    9.18  #
    9.19  # This file is free software; the Free Software Foundation
    9.20  # gives unlimited permission to copy and/or distribute it,
    9.21 @@ -32,10 +32,10 @@
    9.22  # generated from the m4 files accompanying Automake X.Y.
    9.23  # (This private macro should not be called outside this file.)
    9.24  AC_DEFUN([AM_AUTOMAKE_VERSION],
    9.25 -[am__api_version='1.14'
    9.26 +[am__api_version='1.16'
    9.27  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
    9.28  dnl require some minimum version.  Point them to the right macro.
    9.29 -m4_if([$1], [1.14], [],
    9.30 +m4_if([$1], [1.16], [],
    9.31        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
    9.32  ])
    9.33  
    9.34 @@ -51,14 +51,14 @@
    9.35  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
    9.36  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
    9.37  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    9.38 -[AM_AUTOMAKE_VERSION([1.14])dnl
    9.39 +[AM_AUTOMAKE_VERSION([1.16])dnl
    9.40  m4_ifndef([AC_AUTOCONF_VERSION],
    9.41    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
    9.42  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
    9.43  
    9.44  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
    9.45  
    9.46 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
    9.47 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
    9.48  #
    9.49  # This file is free software; the Free Software Foundation
    9.50  # gives unlimited permission to copy and/or distribute it,
    9.51 @@ -103,15 +103,14 @@
    9.52  # configured tree to be moved without reconfiguration.
    9.53  
    9.54  AC_DEFUN([AM_AUX_DIR_EXPAND],
    9.55 -[dnl Rely on autoconf to set up CDPATH properly.
    9.56 -AC_PREREQ([2.50])dnl
    9.57 -# expand $ac_aux_dir to an absolute path
    9.58 -am_aux_dir=`cd $ac_aux_dir && pwd`
    9.59 +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
    9.60 +# Expand $ac_aux_dir to an absolute path.
    9.61 +am_aux_dir=`cd "$ac_aux_dir" && pwd`
    9.62  ])
    9.63  
    9.64  # AM_CONDITIONAL                                            -*- Autoconf -*-
    9.65  
    9.66 -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
    9.67 +# Copyright (C) 1997-2018 Free Software Foundation, Inc.
    9.68  #
    9.69  # This file is free software; the Free Software Foundation
    9.70  # gives unlimited permission to copy and/or distribute it,
    9.71 @@ -142,7 +141,7 @@
    9.72  Usually this means the macro was only invoked conditionally.]])
    9.73  fi])])
    9.74  
    9.75 -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
    9.76 +# Copyright (C) 1999-2018 Free Software Foundation, Inc.
    9.77  #
    9.78  # This file is free software; the Free Software Foundation
    9.79  # gives unlimited permission to copy and/or distribute it,
    9.80 @@ -333,13 +332,12 @@
    9.81  
    9.82  # Generate code to set up dependency tracking.              -*- Autoconf -*-
    9.83  
    9.84 -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
    9.85 +# Copyright (C) 1999-2018 Free Software Foundation, Inc.
    9.86  #
    9.87  # This file is free software; the Free Software Foundation
    9.88  # gives unlimited permission to copy and/or distribute it,
    9.89  # with or without modifications, as long as this notice is preserved.
    9.90  
    9.91 -
    9.92  # _AM_OUTPUT_DEPENDENCY_COMMANDS
    9.93  # ------------------------------
    9.94  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
    9.95 @@ -347,49 +345,41 @@
    9.96    # Older Autoconf quotes --file arguments for eval, but not when files
    9.97    # are listed without --file.  Let's play safe and only enable the eval
    9.98    # if we detect the quoting.
    9.99 -  case $CONFIG_FILES in
   9.100 -  *\'*) eval set x "$CONFIG_FILES" ;;
   9.101 -  *)   set x $CONFIG_FILES ;;
   9.102 -  esac
   9.103 +  # TODO: see whether this extra hack can be removed once we start
   9.104 +  # requiring Autoconf 2.70 or later.
   9.105 +  AS_CASE([$CONFIG_FILES],
   9.106 +          [*\'*], [eval set x "$CONFIG_FILES"],
   9.107 +          [*], [set x $CONFIG_FILES])
   9.108    shift
   9.109 -  for mf
   9.110 +  # Used to flag and report bootstrapping failures.
   9.111 +  am_rc=0
   9.112 +  for am_mf
   9.113    do
   9.114      # Strip MF so we end up with the name of the file.
   9.115 -    mf=`echo "$mf" | sed -e 's/:.*$//'`
   9.116 -    # Check whether this is an Automake generated Makefile or not.
   9.117 -    # We used to match only the files named 'Makefile.in', but
   9.118 -    # some people rename them; so instead we look at the file content.
   9.119 -    # Grep'ing the first line is not enough: some people post-process
   9.120 -    # each Makefile.in and add a new line on top of each file to say so.
   9.121 -    # Grep'ing the whole file is not good either: AIX grep has a line
   9.122 +    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
   9.123 +    # Check whether this is an Automake generated Makefile which includes
   9.124 +    # dependency-tracking related rules and includes.
   9.125 +    # Grep'ing the whole file directly is not great: AIX grep has a line
   9.126      # limit of 2048, but all sed's we know have understand at least 4000.
   9.127 -    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
   9.128 -      dirpart=`AS_DIRNAME("$mf")`
   9.129 -    else
   9.130 -      continue
   9.131 -    fi
   9.132 -    # Extract the definition of DEPDIR, am__include, and am__quote
   9.133 -    # from the Makefile without running 'make'.
   9.134 -    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   9.135 -    test -z "$DEPDIR" && continue
   9.136 -    am__include=`sed -n 's/^am__include = //p' < "$mf"`
   9.137 -    test -z "$am__include" && continue
   9.138 -    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   9.139 -    # Find all dependency output files, they are included files with
   9.140 -    # $(DEPDIR) in their names.  We invoke sed twice because it is the
   9.141 -    # simplest approach to changing $(DEPDIR) to its actual value in the
   9.142 -    # expansion.
   9.143 -    for file in `sed -n "
   9.144 -      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
   9.145 -	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
   9.146 -      # Make sure the directory exists.
   9.147 -      test -f "$dirpart/$file" && continue
   9.148 -      fdir=`AS_DIRNAME(["$file"])`
   9.149 -      AS_MKDIR_P([$dirpart/$fdir])
   9.150 -      # echo "creating $dirpart/$file"
   9.151 -      echo '# dummy' > "$dirpart/$file"
   9.152 -    done
   9.153 +    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
   9.154 +      || continue
   9.155 +    am_dirpart=`AS_DIRNAME(["$am_mf"])`
   9.156 +    am_filepart=`AS_BASENAME(["$am_mf"])`
   9.157 +    AM_RUN_LOG([cd "$am_dirpart" \
   9.158 +      && sed -e '/# am--include-marker/d' "$am_filepart" \
   9.159 +        | $MAKE -f - am--depfiles]) || am_rc=$?
   9.160    done
   9.161 +  if test $am_rc -ne 0; then
   9.162 +    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
   9.163 +    for automatic dependency tracking.  Try re-running configure with the
   9.164 +    '--disable-dependency-tracking' option to at least be able to build
   9.165 +    the package (albeit without support for automatic dependency tracking).])
   9.166 +  fi
   9.167 +  AS_UNSET([am_dirpart])
   9.168 +  AS_UNSET([am_filepart])
   9.169 +  AS_UNSET([am_mf])
   9.170 +  AS_UNSET([am_rc])
   9.171 +  rm -f conftest-deps.mk
   9.172  }
   9.173  ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
   9.174  
   9.175 @@ -398,18 +388,17 @@
   9.176  # -----------------------------
   9.177  # This macro should only be invoked once -- use via AC_REQUIRE.
   9.178  #
   9.179 -# This code is only required when automatic dependency tracking
   9.180 -# is enabled.  FIXME.  This creates each '.P' file that we will
   9.181 -# need in order to bootstrap the dependency handling code.
   9.182 +# This code is only required when automatic dependency tracking is enabled.
   9.183 +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
   9.184 +# order to bootstrap the dependency handling code.
   9.185  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
   9.186  [AC_CONFIG_COMMANDS([depfiles],
   9.187       [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
   9.188 -     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
   9.189 -])
   9.190 +     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
   9.191  
   9.192  # Do all the work for Automake.                             -*- Autoconf -*-
   9.193  
   9.194 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
   9.195 +# Copyright (C) 1996-2018 Free Software Foundation, Inc.
   9.196  #
   9.197  # This file is free software; the Free Software Foundation
   9.198  # gives unlimited permission to copy and/or distribute it,
   9.199 @@ -496,11 +485,11 @@
   9.200  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
   9.201  # For better backward compatibility.  To be removed once Automake 1.9.x
   9.202  # dies out for good.  For more background, see:
   9.203 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
   9.204 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
   9.205 +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
   9.206 +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
   9.207  AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
   9.208 -# We need awk for the "check" target.  The system "awk" is bad on
   9.209 -# some platforms.
   9.210 +# We need awk for the "check" target (and possibly the TAP driver).  The
   9.211 +# system "awk" is bad on some platforms.
   9.212  AC_REQUIRE([AC_PROG_AWK])dnl
   9.213  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   9.214  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
   9.215 @@ -564,7 +553,7 @@
   9.216  Aborting the configuration process, to ensure you take notice of the issue.
   9.217  
   9.218  You can download and install GNU coreutils to get an 'rm' implementation
   9.219 -that behaves properly: <http://www.gnu.org/software/coreutils/>.
   9.220 +that behaves properly: <https://www.gnu.org/software/coreutils/>.
   9.221  
   9.222  If you want to complete the configuration process using your problematic
   9.223  'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
   9.224 @@ -573,7 +562,11 @@
   9.225  END
   9.226      AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   9.227    fi
   9.228 -fi])
   9.229 +fi
   9.230 +dnl The trailing newline in this macro's definition is deliberate, for
   9.231 +dnl backward compatibility and to allow trailing 'dnl'-style comments
   9.232 +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
   9.233 +])
   9.234  
   9.235  dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
   9.236  dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
   9.237 @@ -602,7 +595,7 @@
   9.238  done
   9.239  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
   9.240  
   9.241 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   9.242 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   9.243  #
   9.244  # This file is free software; the Free Software Foundation
   9.245  # gives unlimited permission to copy and/or distribute it,
   9.246 @@ -613,7 +606,7 @@
   9.247  # Define $install_sh.
   9.248  AC_DEFUN([AM_PROG_INSTALL_SH],
   9.249  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
   9.250 -if test x"${install_sh}" != xset; then
   9.251 +if test x"${install_sh+set}" != xset; then
   9.252    case $am_aux_dir in
   9.253    *\ * | *\	*)
   9.254      install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
   9.255 @@ -623,7 +616,7 @@
   9.256  fi
   9.257  AC_SUBST([install_sh])])
   9.258  
   9.259 -# Copyright (C) 2003-2013 Free Software Foundation, Inc.
   9.260 +# Copyright (C) 2003-2018 Free Software Foundation, Inc.
   9.261  #
   9.262  # This file is free software; the Free Software Foundation
   9.263  # gives unlimited permission to copy and/or distribute it,
   9.264 @@ -644,7 +637,7 @@
   9.265  
   9.266  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
   9.267  
   9.268 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   9.269 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   9.270  #
   9.271  # This file is free software; the Free Software Foundation
   9.272  # gives unlimited permission to copy and/or distribute it,
   9.273 @@ -652,49 +645,42 @@
   9.274  
   9.275  # AM_MAKE_INCLUDE()
   9.276  # -----------------
   9.277 -# Check to see how make treats includes.
   9.278 +# Check whether make has an 'include' directive that can support all
   9.279 +# the idioms we need for our automatic dependency tracking code.
   9.280  AC_DEFUN([AM_MAKE_INCLUDE],
   9.281 -[am_make=${MAKE-make}
   9.282 -cat > confinc << 'END'
   9.283 +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
   9.284 +cat > confinc.mk << 'END'
   9.285  am__doit:
   9.286 -	@echo this is the am__doit target
   9.287 +	@echo this is the am__doit target >confinc.out
   9.288  .PHONY: am__doit
   9.289  END
   9.290 -# If we don't find an include directive, just comment out the code.
   9.291 -AC_MSG_CHECKING([for style of include used by $am_make])
   9.292  am__include="#"
   9.293  am__quote=
   9.294 -_am_result=none
   9.295 -# First try GNU make style include.
   9.296 -echo "include confinc" > confmf
   9.297 -# Ignore all kinds of additional output from 'make'.
   9.298 -case `$am_make -s -f confmf 2> /dev/null` in #(
   9.299 -*the\ am__doit\ target*)
   9.300 -  am__include=include
   9.301 -  am__quote=
   9.302 -  _am_result=GNU
   9.303 -  ;;
   9.304 -esac
   9.305 -# Now try BSD make style include.
   9.306 -if test "$am__include" = "#"; then
   9.307 -   echo '.include "confinc"' > confmf
   9.308 -   case `$am_make -s -f confmf 2> /dev/null` in #(
   9.309 -   *the\ am__doit\ target*)
   9.310 -     am__include=.include
   9.311 -     am__quote="\""
   9.312 -     _am_result=BSD
   9.313 -     ;;
   9.314 -   esac
   9.315 -fi
   9.316 -AC_SUBST([am__include])
   9.317 -AC_SUBST([am__quote])
   9.318 -AC_MSG_RESULT([$_am_result])
   9.319 -rm -f confinc confmf
   9.320 -])
   9.321 +# BSD make does it like this.
   9.322 +echo '.include "confinc.mk" # ignored' > confmf.BSD
   9.323 +# Other make implementations (GNU, Solaris 10, AIX) do it like this.
   9.324 +echo 'include confinc.mk # ignored' > confmf.GNU
   9.325 +_am_result=no
   9.326 +for s in GNU BSD; do
   9.327 +  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
   9.328 +  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
   9.329 +      ['0:this is the am__doit target'],
   9.330 +      [AS_CASE([$s],
   9.331 +          [BSD], [am__include='.include' am__quote='"'],
   9.332 +          [am__include='include' am__quote=''])])
   9.333 +  if test "$am__include" != "#"; then
   9.334 +    _am_result="yes ($s style)"
   9.335 +    break
   9.336 +  fi
   9.337 +done
   9.338 +rm -f confinc.* confmf.*
   9.339 +AC_MSG_RESULT([${_am_result}])
   9.340 +AC_SUBST([am__include])])
   9.341 +AC_SUBST([am__quote])])
   9.342  
   9.343  # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
   9.344  
   9.345 -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
   9.346 +# Copyright (C) 1997-2018 Free Software Foundation, Inc.
   9.347  #
   9.348  # This file is free software; the Free Software Foundation
   9.349  # gives unlimited permission to copy and/or distribute it,
   9.350 @@ -733,7 +719,7 @@
   9.351  
   9.352  # Helper functions for option handling.                     -*- Autoconf -*-
   9.353  
   9.354 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   9.355 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   9.356  #
   9.357  # This file is free software; the Free Software Foundation
   9.358  # gives unlimited permission to copy and/or distribute it,
   9.359 @@ -762,7 +748,7 @@
   9.360  AC_DEFUN([_AM_IF_OPTION],
   9.361  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
   9.362  
   9.363 -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
   9.364 +# Copyright (C) 1999-2018 Free Software Foundation, Inc.
   9.365  #
   9.366  # This file is free software; the Free Software Foundation
   9.367  # gives unlimited permission to copy and/or distribute it,
   9.368 @@ -809,7 +795,7 @@
   9.369  # For backward compatibility.
   9.370  AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
   9.371  
   9.372 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   9.373 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   9.374  #
   9.375  # This file is free software; the Free Software Foundation
   9.376  # gives unlimited permission to copy and/or distribute it,
   9.377 @@ -828,7 +814,7 @@
   9.378  
   9.379  # Check to make sure that the build environment is sane.    -*- Autoconf -*-
   9.380  
   9.381 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
   9.382 +# Copyright (C) 1996-2018 Free Software Foundation, Inc.
   9.383  #
   9.384  # This file is free software; the Free Software Foundation
   9.385  # gives unlimited permission to copy and/or distribute it,
   9.386 @@ -909,7 +895,7 @@
   9.387  rm -f conftest.file
   9.388  ])
   9.389  
   9.390 -# Copyright (C) 2009-2013 Free Software Foundation, Inc.
   9.391 +# Copyright (C) 2009-2018 Free Software Foundation, Inc.
   9.392  #
   9.393  # This file is free software; the Free Software Foundation
   9.394  # gives unlimited permission to copy and/or distribute it,
   9.395 @@ -969,7 +955,7 @@
   9.396  _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
   9.397  ])
   9.398  
   9.399 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   9.400 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   9.401  #
   9.402  # This file is free software; the Free Software Foundation
   9.403  # gives unlimited permission to copy and/or distribute it,
   9.404 @@ -997,7 +983,7 @@
   9.405  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
   9.406  AC_SUBST([INSTALL_STRIP_PROGRAM])])
   9.407  
   9.408 -# Copyright (C) 2006-2013 Free Software Foundation, Inc.
   9.409 +# Copyright (C) 2006-2018 Free Software Foundation, Inc.
   9.410  #
   9.411  # This file is free software; the Free Software Foundation
   9.412  # gives unlimited permission to copy and/or distribute it,
   9.413 @@ -1016,7 +1002,7 @@
   9.414  
   9.415  # Check how to create a tarball.                            -*- Autoconf -*-
   9.416  
   9.417 -# Copyright (C) 2004-2013 Free Software Foundation, Inc.
   9.418 +# Copyright (C) 2004-2018 Free Software Foundation, Inc.
   9.419  #
   9.420  # This file is free software; the Free Software Foundation
   9.421  # gives unlimited permission to copy and/or distribute it,
    10.1 --- a/configure	Tue Oct 23 23:00:50 2018 +0300
    10.2 +++ b/configure	Fri Oct 26 10:07:53 2018 -0700
    10.3 @@ -804,7 +804,6 @@
    10.4  AMDEPBACKSLASH
    10.5  AMDEP_FALSE
    10.6  AMDEP_TRUE
    10.7 -am__quote
    10.8  am__include
    10.9  DEPDIR
   10.10  am__untar
   10.11 @@ -913,7 +912,8 @@
   10.12  PACKAGE_TARNAME
   10.13  PACKAGE_NAME
   10.14  PATH_SEPARATOR
   10.15 -SHELL'
   10.16 +SHELL
   10.17 +am__quote'
   10.18  ac_subst_files=''
   10.19  ac_user_opts='
   10.20  enable_option_checking
   10.21 @@ -2475,9 +2475,9 @@
   10.22  
   10.23  MAJOR_VERSION=2
   10.24  MINOR_VERSION=0
   10.25 -MICRO_VERSION=3
   10.26 -INTERFACE_AGE=1
   10.27 -BINARY_AGE=3
   10.28 +MICRO_VERSION=4
   10.29 +INTERFACE_AGE=2
   10.30 +BINARY_AGE=4
   10.31  VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
   10.32  
   10.33  
   10.34 @@ -2613,8 +2613,8 @@
   10.35  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
   10.36  
   10.37  
   10.38 -# expand $ac_aux_dir to an absolute path
   10.39 -am_aux_dir=`cd $ac_aux_dir && pwd`
   10.40 +# Expand $ac_aux_dir to an absolute path.
   10.41 +am_aux_dir=`cd "$ac_aux_dir" && pwd`
   10.42  
   10.43  ac_ext=c
   10.44  ac_cpp='$CPP $CPPFLAGS'
   10.45 @@ -10299,7 +10299,7 @@
   10.46  
   10.47  
   10.48  
   10.49 -am__api_version='1.14'
   10.50 +am__api_version='1.16'
   10.51  
   10.52  # Find a good install program.  We prefer a C program (faster),
   10.53  # so one script is as good as another.  But avoid the broken or
   10.54 @@ -10488,7 +10488,7 @@
   10.55  $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
   10.56  fi
   10.57  
   10.58 -if test x"${install_sh}" != xset; then
   10.59 +if test x"${install_sh+set}" != xset; then
   10.60    case $am_aux_dir in
   10.61    *\ * | *\	*)
   10.62      install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
   10.63 @@ -10725,45 +10725,45 @@
   10.64  
   10.65  ac_config_commands="$ac_config_commands depfiles"
   10.66  
   10.67 -
   10.68 -am_make=${MAKE-make}
   10.69 -cat > confinc << 'END'
   10.70 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
   10.71 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
   10.72 +cat > confinc.mk << 'END'
   10.73  am__doit:
   10.74 -	@echo this is the am__doit target
   10.75 +	@echo this is the am__doit target >confinc.out
   10.76  .PHONY: am__doit
   10.77  END
   10.78 -# If we don't find an include directive, just comment out the code.
   10.79 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
   10.80 -$as_echo_n "checking for style of include used by $am_make... " >&6; }
   10.81  am__include="#"
   10.82  am__quote=
   10.83 -_am_result=none
   10.84 -# First try GNU make style include.
   10.85 -echo "include confinc" > confmf
   10.86 -# Ignore all kinds of additional output from 'make'.
   10.87 -case `$am_make -s -f confmf 2> /dev/null` in #(
   10.88 -*the\ am__doit\ target*)
   10.89 -  am__include=include
   10.90 -  am__quote=
   10.91 -  _am_result=GNU
   10.92 -  ;;
   10.93 -esac
   10.94 -# Now try BSD make style include.
   10.95 -if test "$am__include" = "#"; then
   10.96 -   echo '.include "confinc"' > confmf
   10.97 -   case `$am_make -s -f confmf 2> /dev/null` in #(
   10.98 -   *the\ am__doit\ target*)
   10.99 -     am__include=.include
  10.100 -     am__quote="\""
  10.101 -     _am_result=BSD
  10.102 +# BSD make does it like this.
  10.103 +echo '.include "confinc.mk" # ignored' > confmf.BSD
  10.104 +# Other make implementations (GNU, Solaris 10, AIX) do it like this.
  10.105 +echo 'include confinc.mk # ignored' > confmf.GNU
  10.106 +_am_result=no
  10.107 +for s in GNU BSD; do
  10.108 +  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
  10.109 +   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
  10.110 +   ac_status=$?
  10.111 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
  10.112 +   (exit $ac_status); }
  10.113 +  case $?:`cat confinc.out 2>/dev/null` in #(
  10.114 +  '0:this is the am__doit target') :
  10.115 +    case $s in #(
  10.116 +  BSD) :
  10.117 +    am__include='.include' am__quote='"' ;; #(
  10.118 +  *) :
  10.119 +    am__include='include' am__quote='' ;;
  10.120 +esac ;; #(
  10.121 +  *) :
  10.122       ;;
  10.123 -   esac
  10.124 -fi
  10.125 -
  10.126 -
  10.127 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
  10.128 -$as_echo "$_am_result" >&6; }
  10.129 -rm -f confinc confmf
  10.130 +esac
  10.131 +  if test "$am__include" != "#"; then
  10.132 +    _am_result="yes ($s style)"
  10.133 +    break
  10.134 +  fi
  10.135 +done
  10.136 +rm -f confinc.* confmf.*
  10.137 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
  10.138 +$as_echo "${_am_result}" >&6; }
  10.139  
  10.140  # Check whether --enable-dependency-tracking was given.
  10.141  if test "${enable_dependency_tracking+set}" = set; then :
  10.142 @@ -10876,12 +10876,12 @@
  10.143  
  10.144  # For better backward compatibility.  To be removed once Automake 1.9.x
  10.145  # dies out for good.  For more background, see:
  10.146 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  10.147 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  10.148 +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  10.149 +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  10.150  mkdir_p='$(MKDIR_P)'
  10.151  
  10.152 -# We need awk for the "check" target.  The system "awk" is bad on
  10.153 -# some platforms.
  10.154 +# We need awk for the "check" target (and possibly the TAP driver).  The
  10.155 +# system "awk" is bad on some platforms.
  10.156  # Always define AMTAR for backward compatibility.  Yes, it's still used
  10.157  # in the wild :-(  We should find a proper way to deprecate it ...
  10.158  AMTAR='$${TAR-tar}'
  10.159 @@ -11056,7 +11056,7 @@
  10.160  Aborting the configuration process, to ensure you take notice of the issue.
  10.161  
  10.162  You can download and install GNU coreutils to get an 'rm' implementation
  10.163 -that behaves properly: <http://www.gnu.org/software/coreutils/>.
  10.164 +that behaves properly: <https://www.gnu.org/software/coreutils/>.
  10.165  
  10.166  If you want to complete the configuration process using your problematic
  10.167  'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
  10.168 @@ -11068,6 +11068,7 @@
  10.169  fi
  10.170  
  10.171  
  10.172 +
  10.173  ac_ext=c
  10.174  ac_cpp='$CPP $CPPFLAGS'
  10.175  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  10.176 @@ -14498,7 +14499,7 @@
  10.177  
  10.178  
  10.179  
  10.180 -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  10.181 +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
  10.182  
  10.183  _ACEOF
  10.184  
  10.185 @@ -15587,29 +15588,35 @@
  10.186    # Older Autoconf quotes --file arguments for eval, but not when files
  10.187    # are listed without --file.  Let's play safe and only enable the eval
  10.188    # if we detect the quoting.
  10.189 -  case $CONFIG_FILES in
  10.190 -  *\'*) eval set x "$CONFIG_FILES" ;;
  10.191 -  *)   set x $CONFIG_FILES ;;
  10.192 -  esac
  10.193 +  # TODO: see whether this extra hack can be removed once we start
  10.194 +  # requiring Autoconf 2.70 or later.
  10.195 +  case $CONFIG_FILES in #(
  10.196 +  *\'*) :
  10.197 +    eval set x "$CONFIG_FILES" ;; #(
  10.198 +  *) :
  10.199 +    set x $CONFIG_FILES ;; #(
  10.200 +  *) :
  10.201 +     ;;
  10.202 +esac
  10.203    shift
  10.204 -  for mf
  10.205 +  # Used to flag and report bootstrapping failures.
  10.206 +  am_rc=0
  10.207 +  for am_mf
  10.208    do
  10.209      # Strip MF so we end up with the name of the file.
  10.210 -    mf=`echo "$mf" | sed -e 's/:.*$//'`
  10.211 -    # Check whether this is an Automake generated Makefile or not.
  10.212 -    # We used to match only the files named 'Makefile.in', but
  10.213 -    # some people rename them; so instead we look at the file content.
  10.214 -    # Grep'ing the first line is not enough: some people post-process
  10.215 -    # each Makefile.in and add a new line on top of each file to say so.
  10.216 -    # Grep'ing the whole file is not good either: AIX grep has a line
  10.217 +    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
  10.218 +    # Check whether this is an Automake generated Makefile which includes
  10.219 +    # dependency-tracking related rules and includes.
  10.220 +    # Grep'ing the whole file directly is not great: AIX grep has a line
  10.221      # limit of 2048, but all sed's we know have understand at least 4000.
  10.222 -    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
  10.223 -      dirpart=`$as_dirname -- "$mf" ||
  10.224 -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  10.225 -	 X"$mf" : 'X\(//\)[^/]' \| \
  10.226 -	 X"$mf" : 'X\(//\)$' \| \
  10.227 -	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
  10.228 -$as_echo X"$mf" |
  10.229 +    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
  10.230 +      || continue
  10.231 +    am_dirpart=`$as_dirname -- "$am_mf" ||
  10.232 +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  10.233 +	 X"$am_mf" : 'X\(//\)[^/]' \| \
  10.234 +	 X"$am_mf" : 'X\(//\)$' \| \
  10.235 +	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
  10.236 +$as_echo X"$am_mf" |
  10.237      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  10.238  	    s//\1/
  10.239  	    q
  10.240 @@ -15627,53 +15634,48 @@
  10.241  	    q
  10.242  	  }
  10.243  	  s/.*/./; q'`
  10.244 -    else
  10.245 -      continue
  10.246 -    fi
  10.247 -    # Extract the definition of DEPDIR, am__include, and am__quote
  10.248 -    # from the Makefile without running 'make'.
  10.249 -    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  10.250 -    test -z "$DEPDIR" && continue
  10.251 -    am__include=`sed -n 's/^am__include = //p' < "$mf"`
  10.252 -    test -z "$am__include" && continue
  10.253 -    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  10.254 -    # Find all dependency output files, they are included files with
  10.255 -    # $(DEPDIR) in their names.  We invoke sed twice because it is the
  10.256 -    # simplest approach to changing $(DEPDIR) to its actual value in the
  10.257 -    # expansion.
  10.258 -    for file in `sed -n "
  10.259 -      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  10.260 -	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
  10.261 -      # Make sure the directory exists.
  10.262 -      test -f "$dirpart/$file" && continue
  10.263 -      fdir=`$as_dirname -- "$file" ||
  10.264 -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  10.265 -	 X"$file" : 'X\(//\)[^/]' \| \
  10.266 -	 X"$file" : 'X\(//\)$' \| \
  10.267 -	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
  10.268 -$as_echo X"$file" |
  10.269 -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  10.270 +    am_filepart=`$as_basename -- "$am_mf" ||
  10.271 +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
  10.272 +	 X"$am_mf" : 'X\(//\)$' \| \
  10.273 +	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
  10.274 +$as_echo X/"$am_mf" |
  10.275 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
  10.276  	    s//\1/
  10.277  	    q
  10.278  	  }
  10.279 -	  /^X\(\/\/\)[^/].*/{
  10.280 +	  /^X\/\(\/\/\)$/{
  10.281  	    s//\1/
  10.282  	    q
  10.283  	  }
  10.284 -	  /^X\(\/\/\)$/{
  10.285 -	    s//\1/
  10.286 -	    q
  10.287 -	  }
  10.288 -	  /^X\(\/\).*/{
  10.289 +	  /^X\/\(\/\).*/{
  10.290  	    s//\1/
  10.291  	    q
  10.292  	  }
  10.293  	  s/.*/./; q'`
  10.294 -      as_dir=$dirpart/$fdir; as_fn_mkdir_p
  10.295 -      # echo "creating $dirpart/$file"
  10.296 -      echo '# dummy' > "$dirpart/$file"
  10.297 -    done
  10.298 -  done
  10.299 +    { echo "$as_me:$LINENO: cd "$am_dirpart" \
  10.300 +      && sed -e '/# am--include-marker/d' "$am_filepart" \
  10.301 +        | $MAKE -f - am--depfiles" >&5
  10.302 +   (cd "$am_dirpart" \
  10.303 +      && sed -e '/# am--include-marker/d' "$am_filepart" \
  10.304 +        | $MAKE -f - am--depfiles) >&5 2>&5
  10.305 +   ac_status=$?
  10.306 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
  10.307 +   (exit $ac_status); } || am_rc=$?
  10.308 +  done
  10.309 +  if test $am_rc -ne 0; then
  10.310 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  10.311 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  10.312 +as_fn_error $? "Something went wrong bootstrapping makefile fragments
  10.313 +    for automatic dependency tracking.  Try re-running configure with the
  10.314 +    '--disable-dependency-tracking' option to at least be able to build
  10.315 +    the package (albeit without support for automatic dependency tracking).
  10.316 +See \`config.log' for more details" "$LINENO" 5; }
  10.317 +  fi
  10.318 +  { am_dirpart=; unset am_dirpart;}
  10.319 +  { am_filepart=; unset am_filepart;}
  10.320 +  { am_mf=; unset am_mf;}
  10.321 +  { am_rc=; unset am_rc;}
  10.322 +  rm -f conftest-deps.mk
  10.323  }
  10.324   ;;
  10.325  
    11.1 --- a/configure.in	Tue Oct 23 23:00:50 2018 +0300
    11.2 +++ b/configure.in	Fri Oct 26 10:07:53 2018 -0700
    11.3 @@ -13,9 +13,9 @@
    11.4  
    11.5  MAJOR_VERSION=2
    11.6  MINOR_VERSION=0
    11.7 -MICRO_VERSION=3
    11.8 -INTERFACE_AGE=1
    11.9 -BINARY_AGE=3
   11.10 +MICRO_VERSION=4
   11.11 +INTERFACE_AGE=2
   11.12 +BINARY_AGE=4
   11.13  VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
   11.14  
   11.15  AC_SUBST(MAJOR_VERSION)
    12.1 --- a/debian/changelog	Tue Oct 23 23:00:50 2018 +0300
    12.2 +++ b/debian/changelog	Fri Oct 26 10:07:53 2018 -0700
    12.3 @@ -1,3 +1,9 @@
    12.4 +libsdl2-image (2.0.4) UNRELEASED; urgency=low
    12.5 +
    12.6 +  * Updated to version 2.0.4
    12.7 +
    12.8 + -- Sam Lantinga <slouken@libsdl.org>  Fri, 26 Oct 2018 10:01:54 -0800
    12.9 +
   12.10  libsdl2-image (2.0.3) UNRELEASED; urgency=low
   12.11  
   12.12    * Updated to version 2.0.3
    13.1 --- a/version.rc	Tue Oct 23 23:00:50 2018 +0300
    13.2 +++ b/version.rc	Fri Oct 26 10:07:53 2018 -0700
    13.3 @@ -9,8 +9,8 @@
    13.4  //
    13.5  
    13.6  VS_VERSION_INFO VERSIONINFO
    13.7 - FILEVERSION 2,0,3,0
    13.8 - PRODUCTVERSION 2,0,3,0
    13.9 + FILEVERSION 2,0,4,0
   13.10 + PRODUCTVERSION 2,0,4,0
   13.11   FILEFLAGSMASK 0x3fL
   13.12   FILEFLAGS 0x0L
   13.13   FILEOS 0x40004L
   13.14 @@ -23,12 +23,12 @@
   13.15          BEGIN
   13.16              VALUE "CompanyName", "\0"
   13.17              VALUE "FileDescription", "SDL_image\0"
   13.18 -            VALUE "FileVersion", "2, 0, 3, 0\0"
   13.19 +            VALUE "FileVersion", "2, 0, 4, 0\0"
   13.20              VALUE "InternalName", "SDL_image\0"
   13.21              VALUE "LegalCopyright", "Copyright © 2018 Sam Lantinga\0"
   13.22              VALUE "OriginalFilename", "SDL_image.dll\0"
   13.23              VALUE "ProductName", "Simple DirectMedia Layer\0"
   13.24 -            VALUE "ProductVersion", "2, 0, 3, 0\0"
   13.25 +            VALUE "ProductVersion", "2, 0, 4, 0\0"
   13.26          END
   13.27      END
   13.28      BLOCK "VarFileInfo"