When fetching gen files, make sure aclocal.m4 is older than configure files.

diff --git a/prepare-source b/prepare-source
index 3e4f9edfa12403d3bfc90b7f315a6fa69b3afc30..14ec1b695d643606a8db633335e2015ae6b08097 100755 (executable)
--- a/prepare-source
+++ b/prepare-source
@@ -25,15 +25,17 @@ for action in "${@}"; do
     build|make)
        (cd $dir && make -f prepare-source.mak)
        ;;
-    fetch)
+    fetch|fetchgen)
        $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[ca]*' $dir
-       if ! perl --version >/dev/null 2>/dev/null; then
+       if test "$action" = fetchgen; then
+           $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[^ca]*' .
+       elif ! perl --version >/dev/null 2>/dev/null; then
            $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'p*' .
        fi
+       sleep 1 # The following files need to be newer than aclocal.m4
+       touch configure.sh config.h.in
        ;;
     fetchgen)
-       $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[ca]*' $dir
-       $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[^ca]*' .
        ;;
     fetchSRC)
        ./rsync-ssl -iipr --no-motd --exclude=/.git/ rsync://download.samba.org/ftp/pub/unpacked/rsync/ .