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

diff --git a/Makefile.in b/Makefile.in
index 6285666..055bc75 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,7 +127,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/nightly-rsync b/packaging/nightly-rsync
index 75cfdc4..3aaabcb 100755 (executable)
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -57,7 +57,7 @@ if ($make_tar) {
     close IN;
 
     my $confversion;
-    open(IN, '<', 'configure.in') or die "Unable to open configure.in: $!\n";
+    open(IN, '<', 'configure.ac') or die "Unable to open configure.ac: $!\n";
     while (<IN>) {
        if (/^RSYNC_VERSION=(.*)/) {
            $confversion = $1;
@@ -65,7 +65,7 @@ if ($make_tar) {
        }
     }
     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 "Unable to open OLDNEWS: $!\n";
     $_ = <IN>;

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 939e5b9..0b906c4 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -65,7 +65,7 @@ require 'packaging/git-status.pl';
 check_git_state($master_branch, 1, 1);
 
 my $confversion;
-open(IN, '<', 'configure.in') or die $!;
+open(IN, '<', 'configure.ac') or die $!;
 while (<IN>) {
     if (/^RSYNC_VERSION=(.*)/) {
        $confversion = $1;
@@ -73,7 +73,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>;
@@ -181,7 +181,7 @@ print "\n", $break, <<EOT;
 
 About to:
     - tweak SUBPROTOCOL_VERSION in rsync.h, if needed
-    - tweak the version in configure.in and the spec files
+    - 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
@@ -195,7 +195,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 277dd6f..054bab7 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 655e317..78637ca 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/" \