diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-09 01:34:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-09 01:34:39 -0700 |
| commit | 2f93ecceb91ec8b0a18c95787503341780ca9233 (patch) | |
| tree | fdeb5f997a4ae19147f1ba490922b3c9bc223b1f /m4 | |
| parent | d01ba2f14965203aef327c2cebf1474af0f12f90 (diff) | |
| download | emacs-2f93ecceb91ec8b0a18c95787503341780ca9233.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/getopt.m4 | 3 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 901c213b905..155edb235ff 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -38,7 +38,6 @@ AC_DEFUN([gl_FUNC_GETOPT_GNU], 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 @@ dnl is ambiguous with environment values that contain newlines. fi ]) -# emacs' configure.in uses this. AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], [ GETOPT_H=getopt.h @@ -371,7 +369,6 @@ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], ]) # Prerequisites of lib/getopt*. -# emacs' configure.in uses this. AC_DEFUN([gl_PREREQ_GETOPT], [ AC_CHECK_DECLS_ONCE([getenv]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 824c8bbffc8..754086ec2e7 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -28,7 +28,7 @@ # other built files. -# This macro should be invoked from ./configure.in, in the section +# This macro should be invoked from ./configure.ac, in the section # "Checks for programs", right after AC_PROG_CC, and certainly before # any checks for libraries, header files, types and library functions. AC_DEFUN([gl_EARLY], @@ -118,7 +118,7 @@ AC_DEFUN([gl_EARLY], # Code from module warnings: ]) -# This macro should be invoked from ./configure.in, in the section +# This macro should be invoked from ./configure.ac, in the section # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ |