From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 26 Mar 2016 19:29:25 +0000 (+0100)
Subject: configure.inc: little fix
X-Git-Tag: v4.2.1~797
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da3cc12a3ff3d28fdd7706f253a6ca594c94ab03;p=thirdparty%2Ftvheadend.git

configure.inc: little fix
---

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index b29401dff..764c8866b 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -154,6 +154,12 @@ ifneq (,$(DEB_BUILD_GNU_TYPE))
 LIBX264_HOST := --host=$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifeq (,$(LIBX264_HOST))
+ifneq (,$(filter i386 i486 i586 i686 pentium,$(ARCH)))
+LIBX264_HOST := --host=$(ARCH)-linux-gnu
+endif
+endif
+
 $(LIB_ROOT)/$(LIBX264)/.tvh_download:
 	$(call DOWNLOAD,$(LIBX264_URL),$(LIB_ROOT)/$(LIBX264_TB),$(LIBX264_SHA1))
 	$(call UNTAR,$(LIBX264_TB),j)
diff --git a/support/configure.inc b/support/configure.inc
index 6d44997d2..42b6af856 100755
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -19,7 +19,7 @@ CONFIGURE_ARGS="$*"
 # System setup
 [ -z "$PLATFORM" ] && PLATFORM=$(uname -s | tr "[:upper:]" "[:lower:]")
 [ -z "$CPU"      ] && CPU=generic
-[ -z "$ARCH"     ] && ARCH=$(CC -dumpmachine | cut -d '-' -f 1)
+[ -z "$ARCH"     ] && ARCH=$($CC -dumpmachine | cut -d '-' -f 1)
 [ -z "$ARCH"     ] && ARCH=$(uname -m)
 [ -z "$OSENV"    ] && OSENV=posix
 [ -z "$PYTHON"   ] && PYTHON=python