Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a union for idlist's name/max_id value. Fixes bug 8137.
[rsync/rsync.git]
/
configure
diff --git
a/configure
b/configure
index
811a9d2
..
32cc3b5
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-6,27
+6,22
@@
dir=`dirname $0`
realconfigure="$dir/configure.sh"
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
else
-
curdir='
'
+
actions='build
'
fi
fi
- make -f prepare-source.mak proto.h
- 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 -avz 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
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" "${@}"
fi
exec "$realconfigure" "${@}"