summaryrefslogtreecommitdiff
path: root/gl/m4
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-09-11 15:23:39 +0200
committerSimon Josefsson <simon@josefsson.org>2007-09-11 15:23:39 +0200
commita96a21d4c16fc331b3a7e9311a968c25fc7a29dc (patch)
treec8b990acba4d3d4c75ff76d9c6272b72cb036453 /gl/m4
parentd8df67a0d29f99e8f8010829d63e6f777a5621fe (diff)
downloadgnutls-a96a21d4c16fc331b3a7e9311a968c25fc7a29dc.tar.gz
Update gnulib files.
Diffstat (limited to 'gl/m4')
-rw-r--r--gl/m4/gnulib-cache.m44
-rw-r--r--gl/m4/gnulib-comp.m412
2 files changed, 2 insertions, 14 deletions
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 00da5468c4..7a32349ea3 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,12 +15,12 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline getpass gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf
+# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=malloc-posix --avoid=realloc-posix --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline getpass gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl/override])
gl_MODULES([arpa_inet error fdl gendocs getaddrinfo getline getpass gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf])
-gl_AVOID([snprintf vasnprintf])
+gl_AVOID([malloc-posix realloc-posix snprintf vasnprintf])
gl_SOURCE_BASE([gl])
gl_M4_BASE([gl/m4])
gl_PO_BASE([])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 914e68f689..bbe54c1758 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -62,18 +62,13 @@ AC_DEFUN([gl_INIT],
gl_INET_PTON
gl_FUNC_LSEEK
gl_UNISTD_MODULE_INDICATOR([lseek])
- gl_FUNC_MALLOC_POSIX
- gl_STDLIB_MODULE_INDICATOR([malloc-posix])
gl_HEADER_NETINET_IN
AC_PROG_MKDIR_P
gl_FUNC_READLINE
- gl_FUNC_REALLOC_POSIX
- gl_STDLIB_MODULE_INDICATOR([realloc-posix])
gl_TYPE_SOCKLEN_T
gl_STDARG_H
AM_STDBOOL_H
gl_STDIO_H
- gl_STDLIB_H
gl_FUNC_STRDUP
gl_STRING_MODULE_INDICATOR([strdup])
gl_HEADER_STRING_H
@@ -142,16 +137,13 @@ AC_DEFUN([gl_FILE_LIST], [
lib/inet_pton.c
lib/inet_pton.h
lib/lseek.c
- lib/malloc.c
lib/netinet_in_.h
lib/progname.c
lib/progname.h
lib/readline.c
lib/readline.h
- lib/realloc.c
lib/stdbool_.h
lib/stdio_.h
- lib/stdlib_.h
lib/strdup.c
lib/string_.h
lib/sys_socket_.h
@@ -159,7 +151,6 @@ AC_DEFUN([gl_FILE_LIST], [
lib/version-etc-fsf.c
lib/version-etc.c
lib/version-etc.h
- m4/absolute-header.m4
m4/arpa_inet_h.m4
m4/error.m4
m4/extensions.m4
@@ -176,16 +167,13 @@ AC_DEFUN([gl_FILE_LIST], [
m4/lib-link.m4
m4/lib-prefix.m4
m4/lseek.m4
- m4/malloc.m4
m4/netinet_in_h.m4
m4/readline.m4
- m4/realloc.m4
m4/socklen.m4
m4/sockpfaf.m4
m4/stdarg.m4
m4/stdbool.m4
m4/stdio_h.m4
- m4/stdlib_h.m4
m4/strdup.m4
m4/string_h.m4
m4/sys_socket_h.m4