[Emacs-commit] emacs ./ChangeLog ./Makefile.in ./configure.in ...

[Paul Eggert]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Paul Eggert <address@hidden>    05/07/26 21:43:13

Modified files:
        .              : ChangeLog Makefile.in configure.in make-dist 
        lib-src        : ChangeLog Makefile.in getopt.c getopt1.c 
        nt             : ChangeLog 
        src            : ChangeLog 
        src/s          : cygwin.h 
Added files:
        lib-src        : getopt_.h getopt_int.h gettext.h 
        m4             : getopt.m4 

Log message:
        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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/ChangeLog.diff?tr1=1.426&tr2=1.427&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/Makefile.in.diff?tr1=1.303&tr2=1.304&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/configure.in.diff?tr1=1.394&tr2=1.395&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/make-dist.diff?tr1=1.213&tr2=1.214&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lib-src/getopt_.h?rev=2.1
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lib-src/getopt_int.h?rev=2.1
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lib-src/gettext.h?rev=2.1
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lib-src/ChangeLog.diff?tr1=2.283&tr2=2.284&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lib-src/Makefile.in.diff?tr1=1.142&tr2=1.143&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lib-src/getopt.c.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lib-src/getopt1.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/nt/ChangeLog.diff?tr1=1.116&tr2=1.117&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/ChangeLog.diff?tr1=1.4537&tr2=1.4538&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/s/cygwin.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/m4/getopt.m4?rev=1.1