From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 20 Feb 2011 08:48:52 +0000 (-0800)
Subject: Merge: Import crypto/md5 and stdint modules from gnulib.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/61353ac8cdbdda53d75f5ab9aa7f0b637aee5a00

Merge: Import crypto/md5 and stdint modules from gnulib.
---

61353ac8cdbdda53d75f5ab9aa7f0b637aee5a00
diff --cc ChangeLog
index e667544900,0c116a16f8..5b45cc2eab
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,30 +1,24 @@@
 -2011-02-19  Paul Eggert  <eggert@cs.ucla.edu>
++2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
+ 
 -	Import simpler crypto/md5 module from gnulib, plus stdint module.
++	Import crypto/md5 and stdint modules from gnulib.
+ 	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
 -	* src/config.in: Regenerate.
 -	* lib/md5.c, lib/md5.h: Regenerate with simpler version, which
 -	assumes C99-style <stdint.h>, supplied by the stdint module.
 -	* lib/stdint.in.h, m4/longlong.m4, m4/stdint.m4: New files,
 -	generated from gnulib.
 -	* src/deps.mk (fns.o): Do not depend on md5.h, fixing a typo in
 -	the earlier patch.
 -
 -2011-02-18  Paul Eggert  <eggert@cs.ucla.edu>
 -
 -	Import crypto/md5 module from gnulib.
++	Regenerate.
++	* lib/md5.c, lib/md5.h: Rename from src/md5.h and lib/md5.h.
++	Import the new versions from gnulib; they assume a C99-style
++	<stdint.h>, supplied by the stdint module.
++	* lib/stdint.in.h, m4/longlong.m4, m4/stdint.m4, m4/md5.m4: New files,
++	imported from gnulib.
+ 	* Makefile.in (MAKEFILE_MODULES): Add crypto/md5.
+ 	* admin/notes/copyright: Remove src/md5.c and src/md5.h as
+ 	special cases.
 -	* src/Makefile.in (base_obj): Remove md5.o, since this file
 -	is in lib now.
 -	* src/deps.mk (md5.o): Remove.
 -	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
 -	Regenerate.
 -	* lib/md5.c: Regenerate.  This renames the file from src/md5.c,
 -	and adds some porting improvements from gnulib.
 -	* lib/md5.h: Regenerate, likwise; rename from src/md5.h.
 -	* m4/md5.m4: New file, from gnulib.
++
 +2011-02-19  Eli Zaretskii  <eliz@gnu.org>
 +
 +	* .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
 +	Add lib/deps/.
 +
 +	* config.bat: Configure in `lib'.
 +	Generate *.Po files in lib/deps.
  
  2011-02-18  Paul Eggert  <eggert@cs.ucla.edu>
  
diff --cc src/ChangeLog
index 2b4d60f918,0ca3ab720e..54d912cc15
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,6 +1,18 @@@
 -2011-02-19  Paul Eggert  <eggert@cs.ucla.edu>
++2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
+ 
 -	* deps.mk (fns.o): Depend on ../lib/md5.h.
++	Import crypto/md5 and stdint modules from gnulib.
++	* Makefile.in (base_obj): Remove md5.o, since this file
++	is in lib now.
++	* config.in: Regenerate.
++	* md5.h, md5.h: Move to ../lib.
++	* deps.mk (md5.o): Remove.
++	(fns.o): Depend on ../lib/md5.h, not md5.h.
++
 +2011-02-19  Eli Zaretskii  <eliz@gnu.org>
 +
 +	* termcap.c (tputs): Don't declare baud_rate.
 +
 +	* s/msdos.h (strtold): Define to _strtold.
  
  2011-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>