[vlc-commits] contrib: Update config.sub/guess for kate/caca/sdl/SDL_image

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Sat Dec 16 22:10:55 2017 +0200| [a1e86759582bd4ba5dfce0805d59afa9aaa584e2] | committer: Jean-Baptiste Kempf

contrib: Update config.sub/guess for kate/caca/sdl/SDL_image

This fixes building for non-x86 windows platforms.

(cherry picked from commit de421537d95ea7f7f297826816fdd3be34f4f87d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a1e86759582bd4ba5dfce0805d59afa9aaa584e2
---

 contrib/src/SDL_image/rules.mak | 1 +
 contrib/src/caca/rules.mak      | 2 ++
 contrib/src/kate/rules.mak      | 2 ++
 contrib/src/sdl/rules.mak       | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/contrib/src/SDL_image/rules.mak b/contrib/src/SDL_image/rules.mak
index ab67bc6a8a..c66911ac78 100644
--- a/contrib/src/SDL_image/rules.mak
+++ b/contrib/src/SDL_image/rules.mak
@@ -17,6 +17,7 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
 	$(UNPACK)
 	$(APPLY) $(SRC)/SDL_image/SDL_image.patch
 	$(APPLY) $(SRC)/SDL_image/pkg-config.patch
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
 DEPS_SDL_image = jpeg $(DEPS_jpeg) tiff $(DEPS_tiff) \
diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak
index 95e3325a08..f1f2a31ef7 100644
--- a/contrib/src/caca/rules.mak
+++ b/contrib/src/caca/rules.mak
@@ -20,7 +20,9 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
 	$(APPLY) $(SRC)/caca/caca-llvm-weak-alias.patch
 	$(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
 	$(APPLY) $(SRC)/caca/caca-win32-static.patch
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
+	mv caca/config.sub caca/config.guess caca/.auto
 
 CACA_CONF := \
 	--disable-imlib2 \
diff --git a/contrib/src/kate/rules.mak b/contrib/src/kate/rules.mak
index 5236beda96..150972d278 100644
--- a/contrib/src/kate/rules.mak
+++ b/contrib/src/kate/rules.mak
@@ -15,7 +15,9 @@ $(TARBALLS)/libkate-$(KATE_VERSION).tar.gz:
 
 libkate: libkate-$(KATE_VERSION).tar.gz .sum-kate
 	$(UNPACK)
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
+	mv libkate/config.sub libkate/config.guess libkate/misc/autotools
 
 DEPS_kate = ogg $(DEPS_ogg)
 
diff --git a/contrib/src/sdl/rules.mak b/contrib/src/sdl/rules.mak
index 89948c94c9..4b16cc90f3 100644
--- a/contrib/src/sdl/rules.mak
+++ b/contrib/src/sdl/rules.mak
@@ -16,7 +16,9 @@ $(TARBALLS)/SDL-$(SDL_VERSION).tar.gz:
 sdl: SDL-$(SDL_VERSION).tar.gz .sum-sdl
 	$(UNPACK)
 	$(APPLY) $(SRC)/sdl/direct_palette_ref.diff
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
+	mv sdl/config.sub sdl/config.guess sdl/build-scripts
 
 SDLCONF := $(HOSTCONF) \
 	--disable-audio \