summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2019-04-25 00:42:48 +0200
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2019-05-05 02:50:08 +0200
commit60df54ebd23eba60cb9c53bdaabc5b560100e580 (patch)
tree8ee7a2648f9c82ef2b26b2a7105232d1a8cbcc81 /configure
parent09edcd35726c9ebea8a175b54dfe05483f7154f2 (diff)
downloadffmpeg-streaming-60df54ebd23eba60cb9c53bdaabc5b560100e580.zip
ffmpeg-streaming-60df54ebd23eba60cb9c53bdaabc5b560100e580.tar.gz
configure: Do not overwrite src symlink if it already exists.
Allows running fate from out-of-tree builds on wsl.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 8af41fd..d644a5b 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
OpenPOWER on IntegriCloud