[FFmpeg-cvslog] configure: Do not overwrite src symlink if it already exists.

Carl Eugen Hoyos git at videolan.org
Sun May 5 03:50:24 EEST 2019


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Thu Apr 25 00:42:48 2019 +0200| [60df54ebd23eba60cb9c53bdaabc5b560100e580] | committer: Carl Eugen Hoyos

configure: Do not overwrite src symlink if it already exists.

Allows running fate from out-of-tree builds on wsl.

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

 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 8af41fde9a..d644a5b1d4 100755
--- a/configure
+++ b/configure
@@ -3742,6 +3742,8 @@ mkdir -p ffbuild
 # find source path
 if test -f configure; then
     source_path=.
+elif test -f src/configure; then
+    source_path=src
 else
     source_path=$(cd $(dirname "$0"); pwd)
     case "$source_path" in
@@ -5416,7 +5418,7 @@ link_name=$(mktemp -u $TMPDIR/name_XXXXXXXX)
 mkdir "$link_dest"
 $ln_s "$link_dest" "$link_name"
 touch "$link_dest/test_file"
-if [ "$source_path" != "." ] && ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then
+if [ "$source_path" != "." ] && [ "$source_path" != "src" ] && ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then
     # create link to source path
     [ -e src ] && rm src
     $ln_s "$source_path" src



More information about the ffmpeg-cvslog mailing list