--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2012-07-09  Paul Eggert  <eggert@cs.ucla.edu>
 
+	getloadavg, getopt: fix commentary re configure.in
+	Autoconf is deprecating the name 'configure.in', so change it to
+	to the new name 'configure.ac' in a couple of places.
+	* lib/getloadavg.c: configure.in -> configure.ac, in comment.
+	* m4/getopt.m4 (gl_GETOPT_IFELSE, gl_GETOPT_SUBSTITUTE_HEADER)
+	(gl_PREREQ_GETOPT): Remove obsolete commentary re Emacs configure.in.
+	Emacs has renamed it to configure.ac, and it no longer refers
+	to these macros anyway.
+
 	timespec: mark functions with const attributes
 	* lib/timespec.h (timespec_add, timespec_sub, dtotimespec):
 	Mark with _GL_ATTRIBUTE_CONST.

--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -28,7 +28,7 @@
                                 macro that comes with autoconf 2.13 or newer.
                                 If that isn't an option, then just put
                                 AC_CHECK_FUNCS(pstat_getdynamic) in your
-                                configure.in file.
+                                configure.ac file.
    HAVE_LIBPERFSTAT Define this if your system has the
                                 perfstat_cpu_total function in libperfstat (AIX).
    FIXUP_KERNEL_SYMBOL_ADDR()   Adjust address in returned struct nlist.

--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -38,7 +38,6 @@
   AC_REQUIRE([gl_FUNC_GETOPT_POSIX])
 ])
 
-# emacs' configure.in uses this.
 AC_DEFUN([gl_GETOPT_IFELSE],
 [
   AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
@@ -360,7 +359,6 @@
   fi
 ])
 
-# emacs' configure.in uses this.
 AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
 [
   GETOPT_H=getopt.h
@@ -371,7 +369,6 @@
 ])
 
 # Prerequisites of lib/getopt*.
-# emacs' configure.in uses this.
 AC_DEFUN([gl_PREREQ_GETOPT],
 [
   AC_CHECK_DECLS_ONCE([getenv])