diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-09 00:53:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-09 00:55:23 -0700 |
| commit | 43bc45ba1697b60c4589cb0c8e30cf1618275582 (patch) | |
| tree | 1cfb5d5e35c0543dfaddc60d63171dc128f4b6ee /m4/getopt.m4 | |
| parent | 440bafef7cce6044d4f9d6ca3c3e0856ee9732b7 (diff) | |
| download | emacs-43bc45ba1697b60c4589cb0c8e30cf1618275582.tar.gz | |
Merge from gnulib (Bug#26398)
This incorporates:
2017-04-08 getopt: prefer - to _ in new file names
2017-04-08 getopt: port recent getopt changes to macOS
* .gitignore: Add lib/getopt-cdefs.h.
* lib/getopt-cdefs.in.h: Rename from lib/getopt_cdefs.in.h.
* lib/getopt-core.h: Rename from lib/getopt_core.h.
* lib/getopt-ext.h: Rename from lib/getopt_ext.h.
* lib/getopt-pfx-core.h: Rename from lib/getopt_pfx_core.h.
* lib/getopt-pfx-ext.h: Rename from lib/getopt_pfx_ext.h.
* lib/getopt.in.h, lib/unistd.in.h, m4/getopt.m4:
Copy from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'm4/getopt.m4')
| -rw-r--r-- | m4/getopt.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/getopt.m4 b/m4/getopt.m4 index d90076922b2..ac3b38e385e 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,4 +1,4 @@ -# getopt.m4 serial 45 +# getopt.m4 serial 46 dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -364,7 +364,7 @@ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], [Define to rpl_ if the getopt replacement functions and variables should be used.]) GETOPT_H=getopt.h - GETOPT_CDEFS_H=getopt_cdefs.h + GETOPT_CDEFS_H=getopt-cdefs.h AC_SUBST([GETOPT_H]) AC_SUBST([GETOPT_CDEFS_H]) ]) |