aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-07-08 21:52:49 -0700
committerPaul Eggert2012-07-08 21:52:49 -0700
commitc4444d16dcc6b1cf2ac9e2c0bb20e3f5a54bdea1 (patch)
tree712790cc90ed29dda310c6b461ff3b6a7b04947d
parentf1f924b61976585c693f1f18445889ae891e2211 (diff)
downloademacs-c4444d16dcc6b1cf2ac9e2c0bb20e3f5a54bdea1.tar.gz
emacs-c4444d16dcc6b1cf2ac9e2c0bb20e3f5a54bdea1.zip
Rename configure.in to configure.ac.
Fixes: debbugs:11603
-rw-r--r--ChangeLog12
-rw-r--r--INSTALL4
-rw-r--r--INSTALL.BZR2
-rw-r--r--Makefile.in4
-rw-r--r--README6
-rw-r--r--admin/ChangeLog7
-rw-r--r--admin/admin.el2
-rwxr-xr-xadmin/quick-install-emacs4
-rwxr-xr-xautogen.sh2
-rwxr-xr-xautogen/copy_autogen2
-rwxr-xr-xautogen/update_autogen2
-rw-r--r--configure.ac (renamed from configure.in)2
-rw-r--r--doc/misc/ChangeLog6
-rw-r--r--doc/misc/ede.texi10
-rw-r--r--etc/future-bug2
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/cedet/ChangeLog10
-rw-r--r--lisp/cedet/ede/autoconf-edit.el4
-rw-r--r--lisp/cedet/ede/emacs.el7
-rw-r--r--lisp/cedet/ede/proj.el2
-rw-r--r--lisp/cedet/ede/project-am.el6
-rw-r--r--lisp/emacs-lisp/authors.el2
-rw-r--r--lisp/info-look.el2
-rw-r--r--lisp/progmodes/autoconf.el12
-rwxr-xr-xmake-dist8
-rw-r--r--src/s/template.h5
26 files changed, 87 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog
index b883a4e000a..f776e339149 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
12012-07-09 Paul Eggert <eggert@cs.ucla.edu>
2
3 Rename configure.in to configure.ac (Bug#11603).
4 The name 'configure.in' has been obsolescent for quite some time,
5 and the next release of Autoconf will generate warnings for it.
6 * configure.ac: Rename from configure.in.
7 * INSTALL, INSTALL.BZR, README, make-dist:
8 * Makefile.in (AUTOCONF_INPUTS):
9 * autogen.sh (autoconf_min):
10 * autogen/update_autogen (sources):
11 Adjust to reflect new name.
12
12012-07-08 Paul Eggert <eggert@cs.ucla.edu> 132012-07-08 Paul Eggert <eggert@cs.ucla.edu>
2 14
3 Restore deprecation warnings, except for older libpng. 15 Restore deprecation warnings, except for older libpng.
diff --git a/INSTALL b/INSTALL
index 5c6bc0b97dd..2eab03975f9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -683,9 +683,9 @@ changing the s/*.h and m/*.h files.
683corresponding `Makefile.in' files. This isn't so hard, just a matter 683corresponding `Makefile.in' files. This isn't so hard, just a matter
684of editing in appropriate substitutions for the @...@ constructs. 684of editing in appropriate substitutions for the @...@ constructs.
685 685
686The `configure' script is built from `configure.in' by the `autoconf' 686The `configure' script is built from `configure.ac' by the `autoconf'
687program. You need at least the version of autoconf specified in the 687program. You need at least the version of autoconf specified in the
688AC_PREREQ(...) command to rebuild `configure' from `configure.in'. 688AC_PREREQ(...) command to rebuild `configure' from `configure.ac'.
689 689
690BUILDING GNU EMACS BY HAND 690BUILDING GNU EMACS BY HAND
691 691
diff --git a/INSTALL.BZR b/INSTALL.BZR
index 675eaaf12df..e98d742fb33 100644
--- a/INSTALL.BZR
+++ b/INSTALL.BZR
@@ -8,7 +8,7 @@ Building Emacs from Bazaar requires some tools that are not needed
8when building from a release. You will need: 8when building from a release. You will need:
9 9
10autoconf - at least the version specified near the start of 10autoconf - at least the version specified near the start of
11 configure.in (in the AC_PREREQ command). 11 configure.ac (in the AC_PREREQ command).
12automake - we recommend at least version 1.11. 12automake - we recommend at least version 1.11.
13makeinfo - not strictly necessary, but highly recommended, so that 13makeinfo - not strictly necessary, but highly recommended, so that
14 you can build the manuals. 14 you can build the manuals.
diff --git a/Makefile.in b/Makefile.in
index 0900bd1946f..95b0931087f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -281,7 +281,7 @@ all: ${SUBDIR}
281removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' 281removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
282 282
283# Generate epaths.h from epaths.in. This target is invoked by `configure'. 283# Generate epaths.h from epaths.in. This target is invoked by `configure'.
284# See comments in configure.in for why it is done this way, as opposed 284# See comments in configure.ac for why it is done this way, as opposed
285# to just letting configure generate epaths.h from epaths.in in a 285# to just letting configure generate epaths.h from epaths.in in a
286# similar way to how Makefile is made from Makefile.in. 286# similar way to how Makefile is made from Makefile.in.
287epaths-force: FRC 287epaths-force: FRC
@@ -364,7 +364,7 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
364 ./configure $(CONFIGURE_FLAGS); \ 364 ./configure $(CONFIGURE_FLAGS); \
365 fi 365 fi
366 366
367AUTOCONF_INPUTS = $(srcdir)/configure.in $(srcdir)/aclocal.m4 367AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
368 368
369$(srcdir)/configure: $(AUTOCONF_INPUTS) 369$(srcdir)/configure: $(AUTOCONF_INPUTS)
370 cd ${srcdir} && autoconf 370 cd ${srcdir} && autoconf
diff --git a/README b/README
index 4e1a4c4556f..de4ee24fc5e 100644
--- a/README
+++ b/README
@@ -37,12 +37,12 @@ oddities of your processor and operating system. It creates the file
37process of building and installing Emacs. See INSTALL for more 37process of building and installing Emacs. See INSTALL for more
38detailed information. 38detailed information.
39 39
40The file `configure.in' is the input used by the autoconf program to 40The file `configure.ac' is the input used by the autoconf program to
41construct the `configure' script. Since Emacs has some configuration 41construct the `configure' script. Since Emacs has some configuration
42requirements that autoconf can't meet directly, and for historical 42requirements that autoconf can't meet directly, and for historical
43reasons, `configure.in' uses an unholy marriage of custom-baked 43reasons, `configure.ac' uses an unholy marriage of custom-baked
44configuration code and autoconf macros. If you want to rebuild 44configuration code and autoconf macros. If you want to rebuild
45`configure' from `configure.in', you will need to install a recent 45`configure' from `configure.ac', you will need to install a recent
46version of autoconf and GNU m4. 46version of autoconf and GNU m4.
47 47
48The file `Makefile.in' is a template used by `configure' to create 48The file `Makefile.in' is a template used by `configure' to create
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 53b6143c82c..5ae49cd4b7a 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
12012-07-09 Paul Eggert <eggert@cs.ucla.edu>
2
3 Rename configure.in to configure.ac (Bug#11603).
4 * admin.el (set-version):
5 * quick-install-emacs (VERSION):
6 Get version number from configure.ac, not configure.in.
7
12012-07-06 Paul Eggert <eggert@cs.ucla.edu> 82012-07-06 Paul Eggert <eggert@cs.ucla.edu>
2 9
3 Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786). 10 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."
62 (set-version-in-file root "README" version 62 (set-version-in-file root "README" version
63 (rx (and "version" (1+ space) 63 (rx (and "version" (1+ space)
64 (submatch (1+ (in "0-9.")))))) 64 (submatch (1+ (in "0-9."))))))
65 (set-version-in-file root "configure.in" version 65 (set-version-in-file root "configure.ac" version
66 (rx (and "AC_INIT" (1+ (not (in ?,))) 66 (rx (and "AC_INIT" (1+ (not (in ?,)))
67 ?, (0+ space) 67 ?, (0+ space)
68 (submatch (1+ (in "0-9.")))))) 68 (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 ; }
171test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; } 171test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; }
172 172
173VERSION=` 173VERSION=`
174 sed -n 's/^AC_INIT(emacs,[ ]*\([^ )]*\).*/\1/p' <$SRC/configure.in 174 sed -n 's/^AC_INIT(emacs,[ ]*\([^ )]*\).*/\1/p' <$SRC/configure.ac
175` || exit 4 175` || exit 4
176test -n "$VERSION" || { echo >&2 "$me: no version in configure.in"; exit 4; } 176test -n "$VERSION" || { echo >&2 "$me: no version in configure.ac"; exit 4; }
177 177
178DST_SHARE="$prefix/share/emacs/$VERSION" 178DST_SHARE="$prefix/share/emacs/$VERSION"
179DST_BIN="$prefix/bin" 179DST_BIN="$prefix/bin"
diff --git a/autogen.sh b/autogen.sh
index fb5917fbbf7..0c92047e469 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -34,7 +34,7 @@
34progs="autoconf automake" 34progs="autoconf automake"
35 35
36## Minimum versions we need: 36## Minimum versions we need:
37autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.in` 37autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.ac`
38 38
39## FIXME how to determine this from the sources? 39## FIXME how to determine this from the sources?
40automake_min=1.11 40automake_min=1.11
diff --git a/autogen/copy_autogen b/autogen/copy_autogen
index c9f04ad6253..b6af9b6eb35 100755
--- a/autogen/copy_autogen
+++ b/autogen/copy_autogen
@@ -3,7 +3,7 @@
3## Helper script for those building Emacs from bzr without autoconf etc. 3## Helper script for those building Emacs from bzr without autoconf etc.
4## This installs some pre-generated versions of the automatically 4## This installs some pre-generated versions of the automatically
5## generated files. It is highly recommended to install the necessary 5## generated files. It is highly recommended to install the necessary
6## tools instead of using this. Note that if eg configure.in 6## tools instead of using this. Note that if eg configure.ac
7## is updated, the next time you run make it will attempt to 7## is updated, the next time you run make it will attempt to
8## regenerate configure and will fail if you do not have the required 8## regenerate configure and will fail if you do not have the required
9## tools. You will have to run this script again. 9## tools. You will have to run this script again.
diff --git a/autogen/update_autogen b/autogen/update_autogen
index 58e3838f8c1..14a4119087e 100755
--- a/autogen/update_autogen
+++ b/autogen/update_autogen
@@ -79,7 +79,7 @@ lboot_flag=
79## Parameters. 79## Parameters.
80ldefs_in=lisp/loaddefs.el 80ldefs_in=lisp/loaddefs.el
81ldefs_out=lisp/ldefs-boot.el 81ldefs_out=lisp/ldefs-boot.el
82sources="configure.in lib/Makefile.am" 82sources="configure.ac lib/Makefile.am"
83genfiles=" 83genfiles="
84 configure aclocal.m4 src/config.in lib/Makefile.in 84 configure aclocal.m4 src/config.in lib/Makefile.in
85 build-aux/compile build-aux/config.guess build-aux/config.sub 85 build-aux/compile build-aux/config.guess build-aux/config.sub
diff --git a/configure.in b/configure.ac
index 4df12844b1d..e4371970012 100644
--- a/configure.in
+++ b/configure.ac
@@ -3820,5 +3820,3 @@ fi
3820]) 3820])
3821 3821
3822AC_OUTPUT 3822AC_OUTPUT
3823
3824dnl configure.in ends here
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 99e5b5d9345..d9ddc3c972b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
12012-07-09 Paul Eggert <eggert@cs.ucla.edu>
2
3 Rename configure.in to configure.ac (Bug#11603).
4 * ede.texi (Compiler and Linker objects, ede-proj-project)
5 (ede-step-project): Prefer the name configure.ac to configure.in.
6
12012-07-06 Michael Albinus <michael.albinus@gmx.de> 72012-07-06 Michael Albinus <michael.albinus@gmx.de>
2 8
3 * tramp.texi (Multi-hops): Introduce 9 * tramp.texi (Multi-hops): Introduce
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index f7e39b6c65c..655d11b5d17 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -790,7 +790,7 @@ compilers that will be inserted into the Makefile.
790 790
791Compiler instantiations must also insert variables specifying the 791Compiler instantiations must also insert variables specifying the
792compiler it plans to use, in addition to creating Automake settings for 792compiler it plans to use, in addition to creating Automake settings for
793@file{configure.in} when appropriate. 793@file{configure.ac} when appropriate.
794 794
795Compiler objects are stored in the target objects as a list of 795Compiler objects are stored in the target objects as a list of
796symbols, where the symbols value is the object. This enables the 796symbols, where the symbols value is the object. This enables the
@@ -1557,7 +1557,7 @@ For project @var{THIS}, test that the file @var{FILE} exists, or create it.
1557 1557
1558@deffn Method ede-proj-setup-buildenvironment :AFTER this &optional force 1558@deffn Method ede-proj-setup-buildenvironment :AFTER this &optional force
1559Setup the build environment for project @var{THIS}. 1559Setup the build environment for project @var{THIS}.
1560Handles the Makefile, or a Makefile.am configure.in combination. 1560Handles the Makefile, or a Makefile.am configure.ac combination.
1561Optional argument @var{FORCE} will force items to be regenerated. 1561Optional argument @var{FORCE} will force items to be regenerated.
1562@end deffn 1562@end deffn
1563 1563
@@ -1567,7 +1567,7 @@ These are removed with make clean.
1567@end deffn 1567@end deffn
1568 1568
1569@deffn Method ede-proj-configure-synchronize :AFTER this 1569@deffn Method ede-proj-configure-synchronize :AFTER this
1570Synchronize what we know about project @var{THIS} into configure.in. 1570Synchronize what we know about project @var{THIS} into configure.ac.
1571@end deffn 1571@end deffn
1572 1572
1573@deffn Method ede-proj-makefile-insert-variables-new :AFTER this 1573@deffn Method ede-proj-makefile-insert-variables-new :AFTER this
@@ -1603,7 +1603,7 @@ Return the name of the Makefile with the DIST target in it for @var{THIS}.
1603@end deffn 1603@end deffn
1604 1604
1605@deffn Method ede-proj-configure-file :AFTER this 1605@deffn Method ede-proj-configure-file :AFTER this
1606The configure.in script used by project @var{THIS}. 1606The configure.ac script used by project @var{THIS}.
1607@end deffn 1607@end deffn
1608 1608
1609@deffn Method ede-commit-project :AFTER proj 1609@deffn Method ede-commit-project :AFTER proj
@@ -1767,7 +1767,7 @@ Create a Makefile for all Makefile targets in @var{THIS} if needed.
1767 1767
1768@deffn Method ede-proj-setup-buildenvironment :AFTER this &optional force 1768@deffn Method ede-proj-setup-buildenvironment :AFTER this &optional force
1769Setup the build environment for project @var{THIS}. 1769Setup the build environment for project @var{THIS}.
1770Handles the Makefile, or a Makefile.am configure.in combination. 1770Handles the Makefile, or a Makefile.am configure.ac combination.
1771Optional argument @var{FORCE} will force items to be regenerated. 1771Optional argument @var{FORCE} will force items to be regenerated.
1772@end deffn 1772@end deffn
1773 1773
diff --git a/etc/future-bug b/etc/future-bug
index fb6262dfe55..c18dd995d66 100644
--- a/etc/future-bug
+++ b/etc/future-bug
@@ -30,7 +30,7 @@ comments when you write it (sometime in 2198 as I recall).
30 30
31 31
32P.S. You'll be pleased to know that since (time-forward N) still works 32P.S. You'll be pleased to know that since (time-forward N) still works
33 for N >= 0, we've used it to pre-emptively update configure.in. 33 for N >= 0, we've used it to pre-emptively update configure.ac.
34 Emacs now configures and builds on every platform that will ever 34 Emacs now configures and builds on every platform that will ever
35 be made. It wasn't easy, but at least that's one problem out of 35 be made. It wasn't easy, but at least that's one problem out of
36 the way for good. If you'd like the patch, just ask. 36 the way for good. If you'd like the patch, just ask.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dbe37763d7a..d5d676ec7d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12012-07-09 Paul Eggert <eggert@cs.ucla.edu>
2
3 Rename configure.in to configure.ac (Bug#11603).
4 * emacs-lisp/authors.el (authors-canonical-file-name):
5 * progmodes/autoconf.el (autoconf-mode):
6 Prefer configure.ac to configure.in.
7
12012-07-08 Chong Yidong <cyd@gnu.org> 82012-07-08 Chong Yidong <cyd@gnu.org>
2 9
3 * mouse.el (mouse-drag-line): Rewrite the track-mouse loop. 10 * mouse.el (mouse-drag-line): Rewrite the track-mouse loop.
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index f185c457ee2..bbf700311e1 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,13 @@
12012-07-09 Paul Eggert <eggert@cs.ucla.edu>
2
3 Rename configure.in to configure.ac (Bug#11603).
4 * ede/autoconf-edit.el (autoconf-find-query-for-program)
5 (autoconf-new-program):
6 * ede/emacs.el (ede-emacs-version):
7 * ede/proj.el (ede-proj-setup-buildenvironment):
8 * ede/project-am.el (project-am-autoconf-file-options):
9 Prefer configure.ac to configure.in.
10
12012-03-12 David Engster <deng@randomsample.de> 112012-03-12 David Engster <deng@randomsample.de>
2 12
3 * semantic/db-find.el 13 * semantic/db-find.el
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index 666ba0b0a06..e3c9d2cb4f8 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -31,7 +31,7 @@
31(declare-function ede-srecode-insert "ede/srecode") 31(declare-function ede-srecode-insert "ede/srecode")
32 32
33(defun autoconf-new-program (rootdir program testfile) 33(defun autoconf-new-program (rootdir program testfile)
34 "Initialize a new configure.in in ROOTDIR for PROGRAM using TESTFILE. 34 "Initialize a new configure.ac in ROOTDIR for PROGRAM using TESTFILE.
35ROOTDIR is the root directory of a given autoconf controlled project. 35ROOTDIR is the root directory of a given autoconf controlled project.
36PROGRAM is the program to be configured. 36PROGRAM is the program to be configured.
37TESTFILE is the file used with AC_INIT. 37TESTFILE is the file used with AC_INIT.
@@ -325,7 +325,7 @@ Optional argument PARAM is the parameter to pass to the macro as one string."
325 "Position the cursor where PROG is queried. 325 "Position the cursor where PROG is queried.
326PROG is the VARIABLE to use in autoconf to identify the program. 326PROG is the VARIABLE to use in autoconf to identify the program.
327PROG excludes the _PROG suffix. Thus if PROG were EMACS, then the 327PROG excludes the _PROG suffix. Thus if PROG were EMACS, then the
328variable in configure.in would be EMACS_PROG." 328variable in configure.ac would be EMACS_PROG."
329 (let ((op (point)) 329 (let ((op (point))
330 (found t) 330 (found t)
331 (builtin (assoc prog autoconf-program-builtin))) 331 (builtin (assoc prog autoconf-program-builtin)))
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index d7c83749ffa..e3afe30063c 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -74,13 +74,16 @@ DIR is the directory to search from."
74 "Find the Emacs version for the Emacs src in DIR. 74 "Find the Emacs version for the Emacs src in DIR.
75Return a tuple of ( EMACSNAME . VERSION )." 75Return a tuple of ( EMACSNAME . VERSION )."
76 (let ((buff (get-buffer-create " *emacs-query*")) 76 (let ((buff (get-buffer-create " *emacs-query*"))
77 (configure_ac "configure.ac")
77 (emacs "Emacs") 78 (emacs "Emacs")
78 (ver "")) 79 (ver ""))
79 (with-current-buffer buff 80 (with-current-buffer buff
80 (erase-buffer) 81 (erase-buffer)
81 (setq default-directory (file-name-as-directory dir)) 82 (setq default-directory (file-name-as-directory dir))
83 (or (file-exists-p configure_ac)
84 (setq configure_ac "configure.in"))
82 ;(call-process "egrep" nil buff nil "-n" "-e" "^version=" "Makefile") 85 ;(call-process "egrep" nil buff nil "-n" "-e" "^version=" "Makefile")
83 (call-process "egrep" nil buff nil "-n" "-e" "AC_INIT" "configure.in") 86 (call-process "egrep" nil buff nil "-n" "-e" "AC_INIT" configure_ac)
84 (goto-char (point-min)) 87 (goto-char (point-min))
85 ;(re-search-forward "version=\\([0-9.]+\\)") 88 ;(re-search-forward "version=\\([0-9.]+\\)")
86 (cond 89 (cond
@@ -100,7 +103,7 @@ emacs_beta_version=\\([0-9]+\\)")
100 103
101 ;; Vaguely recent version of GNU Emacs? 104 ;; Vaguely recent version of GNU Emacs?
102 (t 105 (t
103 (insert-file-contents "configure.in") 106 (insert-file-contents configure_ac)
104 (goto-char (point-min)) 107 (goto-char (point-min))
105 (re-search-forward "AC_INIT(emacs,\\s-*\\([0-9.]+\\)\\s-*)") 108 (re-search-forward "AC_INIT(emacs,\\s-*\\([0-9.]+\\)\\s-*)")
106 (setq ver (match-string 1)) 109 (setq ver (match-string 1))
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index d80d55bf916..a8afe9ec804 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -642,7 +642,7 @@ MFILENAME is the makefile to generate."
642(defmethod ede-proj-setup-buildenvironment ((this ede-proj-project) 642(defmethod ede-proj-setup-buildenvironment ((this ede-proj-project)
643 &optional force) 643 &optional force)
644 "Setup the build environment for project THIS. 644 "Setup the build environment for project THIS.
645Handles the Makefile, or a Makefile.am configure.in combination. 645Handles the Makefile, or a Makefile.am configure.ac combination.
646Optional argument FORCE will force items to be regenerated." 646Optional argument FORCE will force items to be regenerated."
647 (if (not force) 647 (if (not force)
648 (ede-proj-makefile-create-maybe this (ede-proj-dist-makefile this)) 648 (ede-proj-makefile-create-maybe this (ede-proj-dist-makefile this))
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index b775cddbc0e..1caaee4b7d4 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -896,10 +896,10 @@ files in the project."
896 out)) 896 out))
897 897
898 898
899;;; Configure.in queries. 899;;; Configure.am queries.
900;; 900;;
901(defvar project-am-autoconf-file-options 901(defvar project-am-autoconf-file-options
902 '("configure.in" "configure.ac") 902 '("configure.ac" "configure.in")
903 "List of possible configure files to look in for project info.") 903 "List of possible configure files to look in for project info.")
904 904
905(defun project-am-autoconf-file (dir) 905(defun project-am-autoconf-file (dir)
@@ -948,7 +948,7 @@ Kill the Configure buffer if it was not already in a buffer."
948 (configfiles nil) 948 (configfiles nil)
949 ) 949 )
950 (cond 950 (cond
951 ;; Try configure.in or configure.ac 951 ;; Try configure.ac or configure.in
952 (conf-in 952 (conf-in
953 (project-am-with-config-current conf-in 953 (project-am-with-config-current conf-in
954 (let ((aci (autoconf-parameters-for-macro "AC_INIT")) 954 (let ((aci (autoconf-parameters-for-macro "AC_INIT"))
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index babb5bf8fc9..aa1a7b52f4c 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -702,7 +702,7 @@ or is on the list of removed files. Returns the non-directory part of
702the file name. Only uses the LOG-FILE position POS and associated AUTHOR 702the file name. Only uses the LOG-FILE position POS and associated AUTHOR
703to print a message if FILE is not found." 703to print a message if FILE is not found."
704 ;; FILE should be re-checked in every different directory associated 704 ;; FILE should be re-checked in every different directory associated
705 ;; with a LOG-FILE. Eg configure.in from src/ChangeLog is not the 705 ;; with a LOG-FILE. Eg configure.ac from src/ChangeLog is not the
706 ;; same as that from top-level/ChangeLog. 706 ;; same as that from top-level/ChangeLog.
707 (let* ((fullname (expand-file-name file (file-name-directory log-file))) 707 (let* ((fullname (expand-file-name file (file-name-directory log-file)))
708 (entry (assoc fullname authors-checked-files-alist)) 708 (entry (assoc fullname authors-checked-files-alist))
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 5eca62ed1bd..eb780fe5620 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -732,7 +732,7 @@ Return nil if there is nothing appropriate in the buffer near point."
732 :parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+\\|##\\|\\+=" 732 :parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+\\|##\\|\\+="
733 :doc-spec '( 733 :doc-spec '(
734 ;; "(automake)Macro Index" is autoconf macros used in 734 ;; "(automake)Macro Index" is autoconf macros used in
735 ;; configure.in, not Makefile.am, so don't have that here. 735 ;; configure.ac, not Makefile.am, so don't have that here.
736 ("(automake)Variable Index" nil "^[ \t]*`" "'") 736 ("(automake)Variable Index" nil "^[ \t]*`" "'")
737 ;; In automake 1.4 macros and variables were a combined node. 737 ;; In automake 1.4 macros and variables were a combined node.
738 ("(automake)Macro and Variable Index" nil "^[ \t]*`" "'") 738 ("(automake)Macro and Variable Index" nil "^[ \t]*`" "'")
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index a7242f6c232..3225fef2dfa 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -1,4 +1,4 @@
1;;; autoconf.el --- mode for editing Autoconf configure.in files 1;;; autoconf.el --- mode for editing Autoconf configure.ac files
2 2
3;; Copyright (C) 2000-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
4 4
@@ -23,15 +23,15 @@
23;;; Commentary: 23;;; Commentary:
24 24
25;; Provides fairly minimal font-lock, imenu and indentation support 25;; Provides fairly minimal font-lock, imenu and indentation support
26;; for editing configure.in files. Only Autoconf syntax is processed. 26;; for editing configure.ac files. Only Autoconf syntax is processed.
27;; There is no attempt to deal with shell text -- probably that will 27;; There is no attempt to deal with shell text -- probably that will
28;; always lose. 28;; always lose.
29 29
30;; This is specialized for configure.in files. It doesn't inherit the 30;; This is specialized for configure.ac files. It doesn't inherit the
31;; general M4 stuff from M4 mode. 31;; general M4 stuff from M4 mode.
32 32
33;; There is also an autoconf-mode.el in existence. That appears to be 33;; There is also an autoconf-mode.el in existence. That appears to be
34;; for editing the Autoconf M4 source, rather than configure.in files. 34;; for editing the Autoconf M4 source, rather than configure.ac files.
35 35
36;;; Code: 36;;; Code:
37 37
@@ -49,7 +49,7 @@
49 `(("\\_<A[CHMS]_\\sw+" . font-lock-keyword-face) 49 `(("\\_<A[CHMS]_\\sw+" . font-lock-keyword-face)
50 (,autoconf-definition-regexp 50 (,autoconf-definition-regexp
51 3 font-lock-function-name-face) 51 3 font-lock-function-name-face)
52 ;; Are any other M4 keywords really appropriate for configure.in, 52 ;; Are any other M4 keywords really appropriate for configure.ac,
53 ;; given that we do `dnl'? 53 ;; given that we do `dnl'?
54 ("changequote" . font-lock-keyword-face))) 54 ("changequote" . font-lock-keyword-face)))
55 55
@@ -78,7 +78,7 @@ searching backwards at another AC_... command."
78 78
79;;;###autoload 79;;;###autoload
80(define-derived-mode autoconf-mode prog-mode "Autoconf" 80(define-derived-mode autoconf-mode prog-mode "Autoconf"
81 "Major mode for editing Autoconf configure.in files." 81 "Major mode for editing Autoconf configure.ac files."
82 (set (make-local-variable 'parens-require-spaces) nil) ; for M4 arg lists 82 (set (make-local-variable 'parens-require-spaces) nil) ; for M4 arg lists
83 (set (make-local-variable 'defun-prompt-regexp) 83 (set (make-local-variable 'defun-prompt-regexp)
84 "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+") 84 "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+")
diff --git a/make-dist b/make-dist
index 0582f994672..cc14ff3987b 100755
--- a/make-dist
+++ b/make-dist
@@ -147,7 +147,7 @@ fi
147 147
148### Find out which version of Emacs this is. 148### Find out which version of Emacs this is.
149version=` 149version=`
150 sed -n 's/^AC_INIT(emacs,[ ]*\([^ )]*\).*/\1/p' <configure.in 150 sed -n 's/^AC_INIT(emacs,[ ]*\([^ )]*\).*/\1/p' <configure.ac
151` || version= 151` || version=
152if [ ! "${version}" ]; then 152if [ ! "${version}" ]; then
153 echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2 153 echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
@@ -230,13 +230,13 @@ fi
230 230
231if [ $update = yes ]; then 231if [ $update = yes ]; then
232 232
233 ## Make sure configure is newer than configure.in, etc. 233 ## Make sure configure is newer than configure.ac, etc.
234 ## It is better to let autoreconf do what is needed than 234 ## It is better to let autoreconf do what is needed than
235 ## for us to try and duplicate all its checks. 235 ## for us to try and duplicate all its checks.
236 echo "Running autoreconf" 236 echo "Running autoreconf"
237 autoreconf -i -I m4 || { x=$?; echo Autoreconf FAILED! >&2; exit $x; } 237 autoreconf -i -I m4 || { x=$?; echo Autoreconf FAILED! >&2; exit $x; }
238 238
239 ## Make sure src/stamp-h.in is newer than configure.in. 239 ## Make sure src/stamp-h.in is newer than configure.ac.
240 rm -f src/stamp-h.in 240 rm -f src/stamp-h.in
241 echo timestamp > src/stamp-h.in 241 echo timestamp > src/stamp-h.in
242 242
@@ -273,7 +273,7 @@ mkdir ${tempdir}
273### README while the rest of the tar file is still unpacking. Whoopee. 273### README while the rest of the tar file is still unpacking. Whoopee.
274echo "Making links to top-level files" 274echo "Making links to top-level files"
275ln INSTALL README BUGS ${tempdir} 275ln INSTALL README BUGS ${tempdir}
276ln ChangeLog Makefile.in configure configure.in ${tempdir} 276ln ChangeLog Makefile.in configure configure.ac ${tempdir}
277ln config.bat make-dist .dir-locals.el ${tempdir} 277ln config.bat make-dist .dir-locals.el ${tempdir}
278ln aclocal.m4 ${tempdir} 278ln aclocal.m4 ${tempdir}
279 279
diff --git a/src/s/template.h b/src/s/template.h
index e3557aa191b..17c003a8df5 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -94,14 +94,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
94/* ============================================================ */ 94/* ============================================================ */
95 95
96/* After adding support for a new system, modify the large case 96/* After adding support for a new system, modify the large case
97 statement in configure.in to recognize reasonable 97 statement in configure.ac to recognize reasonable
98 configuration names, and add a description of the system to 98 configuration names, and add a description of the system to
99 `etc/MACHINES'. 99 `etc/MACHINES'.
100 100
101 Check for any tests of $opsys in configure.in, and add an entry 101 Check for any tests of $opsys in configure.ac, and add an entry
102 for the new system if needed. 102 for the new system if needed.
103 103
104 If you've just fixed a problem in an existing configuration file, 104 If you've just fixed a problem in an existing configuration file,
105 you should also check `etc/MACHINES' to make sure its descriptions 105 you should also check `etc/MACHINES' to make sure its descriptions
106 of known problems in that configuration should be updated. */ 106 of known problems in that configuration should be updated. */
107