Rename configure.in to configure.ac, the current autoconf standard.

diff --git a/Makefile.in b/Makefile.in
index 7d18a4acea85d71ca740ee38f4b1096e5c4fce0f..38986da7bb73325c3c89dba774f45fb05730eae9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,7 +123,7 @@ gensend: gen
 conf:
        cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
-configure.sh config.h.in: configure.in aclocal.m4
+configure.sh config.h.in: configure.ac aclocal.m4
        @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
        @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
        autoconf -o configure.sh

diff --git a/configure.in b/configure.ac
similarity index 100%
rename from configure.in
rename to configure.ac

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 6fa4213744197eafd012d19219c9c6ef2974413a..b2884d9833b4fd97e79a2afd1b63cee39342a20d 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -67,7 +67,7 @@ die "The checkout is not clean:\n", $status unless $status =~ /\nnothing to comm
 die "The checkout is not on the $master_branch branch.\n" unless $status =~ /^# On branch $master_branch\n/;
 
 my $confversion;
-open(IN, '<', 'configure.in') or die $!;
+open(IN, '<', 'configure.ac') or die $!;
 while (<IN>) {
     if (/^RSYNC_VERSION=(.*)/) {
        $confversion = $1;
@@ -75,7 +75,7 @@ while (<IN>) {
     }
 }
 close IN;
-die "Unable to find RSYNC_VERSION in configure.in\n" unless defined $confversion;
+die "Unable to find RSYNC_VERSION in configure.ac\n" unless defined $confversion;
 
 open(IN, '<', 'OLDNEWS') or die $!;
 $_ = <IN>;
@@ -146,9 +146,9 @@ print "\n", $break, <<EOT;
 \$release is "$release"
 
 About to:
-    - make sure that SUBPROTOCOL_VERSION is 0$skipping
-    - tweak the version in configure.in and the spec files
-    - tweak NEWS and OLDNEWS to update the release date$skipping
+    - tweak SUBPROTOCOL_VERSION in rsync.h, if needed
+    - tweak the version in configure.ac and the spec files
+    - tweak NEWS and OLDNEWS to ensure header values are correct
     - tweak the date in the *.yo files and generate the manpages
     - generate configure.sh, config.h.in, and proto.h
     - page through the differences
@@ -162,7 +162,7 @@ my %specvars = ( 'Version:' => $finalversion, 'Release:' => $release,
                 '%define fullversion' => "\%{version}$pre", 'Released' => "$version.",
                 '%define srcdir' => $srcdir );
 my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'), glob('*.yo'),
-                   qw( configure.in rsync.h NEWS OLDNEWS options.c ) );
+                   qw( configure.ac rsync.h NEWS OLDNEWS options.c ) );
 
 foreach my $fn (@tweak_files) {
     open(IN, '<', $fn) or die $!;

diff --git a/prepare-source.mak b/prepare-source.mak
index 277dd6f22aa7b799932b8f20957e15530ce1decf..054bab70689f29b05f91879409755228739cf176 100644 (file)
--- a/prepare-source.mak
+++ b/prepare-source.mak
@@ -1,7 +1,7 @@
 conf: configure.sh config.h.in
 
-configure.sh: configure.in aclocal.m4
+configure.sh: configure.ac aclocal.m4
        autoconf -o configure.sh
 
-config.h.in: configure.in aclocal.m4
+config.h.in: configure.ac aclocal.m4
        autoheader && touch config.h.in

diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index bdb08c2fac58d939d1bc4b7e2ab0519c8a0d7a0a..0dbb5a4beedbad14eb00bed8b5fce7e3614e2da7 100644 (file)
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -17,7 +17,7 @@ outfile="$scratchdir/rsync.out"
 
 makepath "$fromdir/foo"
 makepath "$fromdir/bar/baz"
-cp -p "$srcdir/configure.in" "$fromdir/foo/config1"
+cp -p "$srcdir/configure.ac" "$fromdir/foo/config1"
 cp -p "$srcdir/config.h.in" "$fromdir/foo/config2"
 cp -p "$srcdir/rsync.h" "$fromdir/bar/baz/rsync"
 chmod 600 "$fromdir"/foo/config? "$fromdir/bar/baz/rsync"
@@ -66,7 +66,7 @@ diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
 # Ensure there are no accidental directory-time problems.
 $RSYNC -a -f '-! */' "$fromdir/" "$todir"
 
-cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
+cp -p "$srcdir/configure.ac" "$fromdir/foo/config2"
 chmod 601 "$fromdir/foo/config2"
 $RSYNC -iplrH "$fromdir/" "$todir/" \
     | tee "$outfile"
@@ -99,7 +99,7 @@ cLc$T.$dots foo/sym -> ../bar/baz/rsync
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
 
-cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
+cp -p "$srcdir/configure.ac" "$fromdir/foo/config2"
 chmod 600 "$fromdir/foo/config2"
 # Lack of -t is for unchanged hard-link stress-test!
 $RSYNC -vvplrH "$fromdir/" "$todir/" \