diff options
| author | Paul Eggert | 2011-02-18 00:07:03 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-18 00:07:03 -0800 |
| commit | 942f733fd1251da4486cf1d72ec5569532dfd19d (patch) | |
| tree | 7c04854c15370219b6282c302ebcaed75a2f0eb8 /m4 | |
| parent | 37b3d30244ad822e049b6b20c2eadf5946cb02cc (diff) | |
| download | emacs-942f733fd1251da4486cf1d72ec5569532dfd19d.tar.gz emacs-942f733fd1251da4486cf1d72ec5569532dfd19d.zip | |
Import crypto/md5 module 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-18 Paul Eggert <eggert@cs.ucla.edu>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gl-comp.m4 | 6 | ||||
| -rw-r--r-- | m4/md5.m4 | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/m4/gl-comp.m4 b/m4/gl-comp.m4 index 036b67452c8..975374f428f 100644 --- a/m4/gl-comp.m4 +++ b/m4/gl-comp.m4 | |||
| @@ -28,6 +28,7 @@ AC_DEFUN([gl_EARLY], | |||
| 28 | AC_REQUIRE([AC_PROG_RANLIB]) | 28 | AC_REQUIRE([AC_PROG_RANLIB]) |
| 29 | # Code from module arg-nonnull: | 29 | # Code from module arg-nonnull: |
| 30 | # Code from module c++defs: | 30 | # Code from module c++defs: |
| 31 | # Code from module crypto/md5: | ||
| 31 | # Code from module dtoastr: | 32 | # Code from module dtoastr: |
| 32 | # Code from module extensions: | 33 | # Code from module extensions: |
| 33 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | 34 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) |
| @@ -68,6 +69,8 @@ AC_DEFUN([gl_INIT], | |||
| 68 | gl_source_base='lib' | 69 | gl_source_base='lib' |
| 69 | # Code from module arg-nonnull: | 70 | # Code from module arg-nonnull: |
| 70 | # Code from module c++defs: | 71 | # Code from module c++defs: |
| 72 | # Code from module crypto/md5: | ||
| 73 | gl_MD5 | ||
| 71 | # Code from module dtoastr: | 74 | # Code from module dtoastr: |
| 72 | AC_REQUIRE([gl_C99_STRTOLD]) | 75 | AC_REQUIRE([gl_C99_STRTOLD]) |
| 73 | # Code from module extensions: | 76 | # Code from module extensions: |
| @@ -261,6 +264,8 @@ AC_DEFUN([gl_FILE_LIST], [ | |||
| 261 | lib/gettext.h | 264 | lib/gettext.h |
| 262 | lib/ignore-value.h | 265 | lib/ignore-value.h |
| 263 | lib/intprops.h | 266 | lib/intprops.h |
| 267 | lib/md5.c | ||
| 268 | lib/md5.h | ||
| 264 | lib/mktime-internal.h | 269 | lib/mktime-internal.h |
| 265 | lib/mktime.c | 270 | lib/mktime.c |
| 266 | lib/stdbool.in.h | 271 | lib/stdbool.in.h |
| @@ -278,6 +283,7 @@ AC_DEFUN([gl_FILE_LIST], [ | |||
| 278 | m4/getopt.m4 | 283 | m4/getopt.m4 |
| 279 | m4/gnulib-common.m4 | 284 | m4/gnulib-common.m4 |
| 280 | m4/include_next.m4 | 285 | m4/include_next.m4 |
| 286 | m4/md5.m4 | ||
| 281 | m4/mktime.m4 | 287 | m4/mktime.m4 |
| 282 | m4/multiarch.m4 | 288 | m4/multiarch.m4 |
| 283 | m4/stdbool.m4 | 289 | m4/stdbool.m4 |
diff --git a/m4/md5.m4 b/m4/md5.m4 new file mode 100644 index 00000000000..ce7671d6cea --- /dev/null +++ b/m4/md5.m4 | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | # md5.m4 serial 11 | ||
| 2 | dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc. | ||
| 3 | dnl This file is free software; the Free Software Foundation | ||
| 4 | dnl gives unlimited permission to copy and/or distribute it, | ||
| 5 | dnl with or without modifications, as long as this notice is preserved. | ||
| 6 | |||
| 7 | AC_DEFUN([gl_MD5], | ||
| 8 | [ | ||
| 9 | AC_LIBOBJ([md5]) | ||
| 10 | |||
| 11 | dnl Prerequisites of lib/md5.c. | ||
| 12 | AC_REQUIRE([gl_BIGENDIAN]) | ||
| 13 | AC_REQUIRE([AC_C_INLINE]) | ||
| 14 | : | ||
| 15 | ]) | ||