Avoid leaving a file open on error return.

[rsync.git] / configure

diff --git a/configure b/configure
index cc4bcb6340d6596760814dca2d24679895f75c93..32cc3b5d8d9bcaf4b7987da7a9520d8f73eed29f 100755 (executable)
--- a/configure
+++ b/configure
@@ -6,26 +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.
-       rsync -pvz rsync://rsync.samba.org/rsyncftp/generated-files/'c*' .
     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" "${@}"