X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bcfb738c93a586283457ea1c7015f321fd1f3f48..bd685982389b78a158921b7839bdeca501338d19:/configure

diff --git a/configure b/configure
index 96198f6b..32cc3b5d 100755
--- a/configure
+++ b/configure
@@ -6,31 +6,22 @@
 dir=`dirname $0`
 realconfigure="$dir/configure.sh"
 
-if [ ! -f "$realconfigure" ]; then
-    if test x"$dir" != x -a x"$dir" != x.; then
-	curdir=`pwd`
-	cd "$dir"
+if test ! -f "$realconfigure"; then
+    if test -f "$HOME/build_farm/build_test.fns"; then
+	# Test the included popt
+	set -- --with-included-popt "${@}"
+	# Allow the build farm to grab latest files via rsync.
+	actions='build fetch'
     else
-	curdir=''
+	actions='build'
     fi
-    if make -f prepare-source.mak conf; then
+    if "$dir/prepare-source" $actions; then
 	:
-    elif [ -f "$HOME/build_farm/build_test.fns" ]; then
-	# Allow the build farm to grab latest files via rsync.
-	if perl --version >/dev/null; then
-	    files='c*'
-	else
-	    files='[cp]*'
-	fi
-	rsync -pvz rsync://rsync.samba.org/rsyncftp/generated-files/"$files" .
     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
-	cd "$curdir"
-    fi
 fi
 
 exec "$realconfigure" "${@}"