[FFmpeg-cvslog] Merge commit '518a22471e40604a158180a0660aabeeec65e07f'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  8 14:51:56 2017 +0200| [efb0ea2af4a8afd51bd459aa9c1d6c51a1cba271] | committer: Clément Bœsch

Merge commit '518a22471e40604a158180a0660aabeeec65e07f'

* commit '518a22471e40604a158180a0660aabeeec65e07f':
  configure: Be more helpful when requiring options set

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efb0ea2af4a8afd51bd459aa9c1d6c51a1cba271
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index b702d22..3936202 100755
--- a/configure
+++ b/configure
@@ -3680,7 +3680,7 @@ test -n "$cross_prefix" && enable cross_compile
 
 if enabled cross_compile; then
     test -n "$arch" && test -n "$target_os" ||
-        die "Must specify target arch and OS when cross-compiling"
+        die "Must specify target arch (--arch) and OS (--target-os) when cross-compiling"
 fi
 
 ar_default="${cross_prefix}${ar_default}"


======================================================================