Merge gnulib getopt implementation into Emacs.
authorPaul Eggert <eggert@twinsun.com>
Tue, 26 Jul 2005 21:43:13 +0000 (21:43 +0000)
committerPaul Eggert <eggert@twinsun.com>
Tue, 26 Jul 2005 21:43:13 +0000 (21:43 +0000)
commit9eff9fe3e8ab53b7a8ad2c1633b0681beb3b655c
tree36f83598b89a1567622ee38b623f7888a4c2e904
parent1c9916a1f9dc944ee733f5c77db39013123da8da
Merge gnulib getopt implementation into Emacs.

* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory.  Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.

* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).

* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.

* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
15 files changed:
ChangeLog
Makefile.in
configure.in
lib-src/ChangeLog
lib-src/Makefile.in
lib-src/getopt.c
lib-src/getopt1.c
lib-src/getopt_.h [new file with mode: 0644]
lib-src/getopt_int.h [new file with mode: 0644]
lib-src/gettext.h [new file with mode: 0644]
m4/getopt.m4 [new file with mode: 0644]
make-dist
nt/ChangeLog
src/ChangeLog
src/s/cygwin.h