[FFmpeg-cvslog] fate: get samples location from env var if not explicitly set

Mans Rullgard git
Mon Feb 28 00:53:19 CET 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sat Feb 26 11:51:18 2011 +0000| [1a9fc2b93be18b4b20310cca23e062133a798426] | committer: Michael Niedermayer

fate: get samples location from env var if not explicitly set

Use the FATE_SAMPLES environment variable if samples location
is not set with the --samples configure option or on the make
command line.

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit aa3805a486831d9c9e40cc9e897c048d60b51c1a)

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

 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index c3c2027..b9252fa 100755
--- a/configure
+++ b/configure
@@ -3258,7 +3258,7 @@ SLIB_CREATE_DEF_CMD=${SLIB_CREATE_DEF_CMD}
 SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}
 SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}
 SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}
-SAMPLES=$samples
+SAMPLES=${samples:-\$(FATE_SAMPLES)}
 EOF
 
 get_version(){




More information about the ffmpeg-cvslog mailing list