[FFmpeg-cvslog] configure: simplify source_path setup
Mans Rullgard
git at videolan.org
Tue Jun 7 03:49:10 CEST 2011
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Jun 6 12:56:26 2011 +0100| [8477f2deefbebe7dab9dce4c9ed5f3bc8030206d] | committer: Mans Rullgard
configure: simplify source_path setup
Signed-off-by: Mans Rullgard <mans at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8477f2deefbebe7dab9dce4c9ed5f3bc8030206d
---
configure | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index d680337..34c1ed6 100755
--- a/configure
+++ b/configure
@@ -1684,13 +1684,12 @@ DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)
DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -MM'
# find source path
-source_path="$(dirname "$0")"
-enable source_path_used
if test -f configure; then
source_path="$(pwd)"
disable source_path_used
else
- source_path="$(cd "$source_path"; pwd)"
+ source_path=$(cd $(dirname "$0"); pwd)
+ enable source_path_used
echo "$source_path" | grep -q '[[:blank:]]' &&
die "Out of tree builds are impossible with whitespace in source path."
test -e "$source_path/config.h" &&
More information about the ffmpeg-cvslog
mailing list