Rename configure.in to configure.ac.

Fixes: debbugs:11603

3 files changed, 10 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 53b6143c82c..5ae49cd4b7a 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Rename configure.in to configure.ac (Bug#11603).
+        * admin.el (set-version):
+        * quick-install-emacs (VERSION):
+        Get version number from configure.ac, not configure.in.
+
 2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
diff --git a/admin/admin.el b/admin/admin.el
index 9fcc5795d21..6d729214bd0 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -62,7 +62,7 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "README" version
                        (rx (and "version" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "configure.in" version
+  (set-version-in-file root "configure.ac" version
                        (rx (and "AC_INIT" (1+ (not (in ?,)))
                                 ?, (0+ space)
                                 (submatch (1+ (in "0-9."))))))
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 7004e8f1b27..4abef102dc4 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -171,9 +171,9 @@ test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; }
 test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; }
 
 VERSION=`
-  sed -n 's/^AC_INIT(emacs,[     ]*\([^  )]*\).*/\1/p' <$SRC/configure.in
+  sed -n 's/^AC_INIT(emacs,[     ]*\([^  )]*\).*/\1/p' <$SRC/configure.ac
 ` || exit 4
-test -n "$VERSION" || { echo >&2 "$me: no version in configure.in"; exit 4; }
+test -n "$VERSION" || { echo >&2 "$me: no version in configure.ac"; exit 4; }
 
 DST_SHARE="$prefix/share/emacs/$VERSION"
 DST_BIN="$prefix/bin"