We always add a slash now that path is cleaned.

[rsync.git] / configure

diff --git a/configure b/configure
index dec14ab02c51d62154db8ff6a657cd9b3850fcdb..51c3fee581f73853fde74b2b887a0468790706e5 100755 (executable)
--- a/configure
+++ b/configure
@@ -4,31 +4,24 @@
 # then transfer control to the configure.sh script to do the real work.
 
 dir=`dirname $0`
-realconfigure="$dir/configure.sh"
+if test x"$dir" = x; then
+    dir=.
+fi
 
-if test ! -f "$realconfigure"; then
-    if test x"$dir" != x -a x"$dir" != x.; then
-       curdir=`pwd`
-       cd "$dir"
-    else
-       curdir=''
-    fi
-    if test -f "$HOME/build_farm/build_test.fns"; then
-       # Allow the build farm to grab latest files via rsync.
-       fetch=fetch
-    else
-       fetch=''
+if test "$dir" = '.'; then
+    branch=`packaging/prep-auto-dir` || exit 1
+    if test x"$branch" != x; then
+       cd build || exit 1
+       dir=..
     fi
-    if ./prepare-source $fetch; then
-       :
-    else
+fi
+
+if test ! -f configure.sh; then
+    if ! "$dir/prepare-source" build; then
        echo 'Failed to build configure.sh and/or config.h.in -- giving up.' >&2
-       rm -f "$realconfigure"
+       rm -f configure.sh
        exit 1
     fi
-    if test x"$curdir" != x; then
-       cd "$curdir"
-    fi
 fi
 
-exec "$realconfigure" "${@}"
+exec ./configure.sh --srcdir="$dir" "${@}"