configure.inc: little fix

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index b29401dffec4e1d64afd9a5e9c7111afc8ba8503..764c8866b589ea5efdca3402483fd81682abb0b9 100644 (file)
--- 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 6d44997d2b227c8cdd396ffbe4545a903ba56077..42b6af85684c0e910a503da8971e4c7af28235bf 100755 (executable)
--- 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