+2005-07-26 Paul Eggert <eggert@cs.ucla.edu>
+
+ Merge gnulib getopt implementation into Emacs.
+
+ * 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).
+ * getopt.c, getopt1.c: Sync from gnulib.
+ * getopt_.h, getopt_int.h, gettext.h: New files, from gnulib.
+ * getopt.h: Removed (now is getopt_.h).
+
2005-07-13 Ken Raeburn <raeburn@gnu.org>
* pop.c: Don't include des.h (or variants thereof); krb.h will do