Reorganize the build-farm "prepare-source" magic a little.

[rsync/rsync.git] / configure

diff --git a/configure b/configure
index a8d3480..dec14ab 100755 (executable)
--- a/configure
+++ b/configure
@@ -6,21 +6,24 @@
 dir=`dirname $0`
 realconfigure="$dir/configure.sh"
 
-if [ ! -f "$realconfigure" ]; then
+if test ! -f "$realconfigure"; then
     if test x"$dir" != x -a x"$dir" != x.; then
        curdir=`pwd`
        cd "$dir"
     else
        curdir=''
     fi
-    make -f prepare-source.mak proto.h
-    if make -f prepare-source.mak conf; then
-       :
-    elif [ -f "$HOME/build_farm/build_test.fns" ]; then
+    if test -f "$HOME/build_farm/build_test.fns"; then
        # Allow the build farm to grab latest files via rsync.
-       rsync -avz rsync://rsync.samba.org/rsyncftp/generated-files/'c*' .
+       fetch=fetch
+    else
+       fetch=''
+    fi
+    if ./prepare-source $fetch; then
+       :
     else
        echo 'Failed to build configure.sh and/or config.h.in -- giving up.' >&2
+       rm -f "$realconfigure"
        exit 1
     fi
     if test x"$curdir" != x; then