diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:54:38 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:54:38 +0200 |
| commit | ed36822e37b3328dc52c70f96c0a099f224edc1a (patch) | |
| tree | d271ea51301cac4daddaa482a4f9ff6e27b145df /configure.ac | |
| parent | 0972943f5265dca1f56dcb25bd361d40040bef87 (diff) | |
| parent | 0a24b3afc093e16038da170458e2ecb68b363bdd (diff) | |
| download | rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.tar.gz rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.tar.xz rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
configure.ac
runtime/cfsysline.c
tools/ompipe.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 21a5c0cf..7b9a1949 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRERROR_R AC_FUNC_VPRINTF -AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync]) +AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync lseek64]) # Check for MAXHOSTNAMELEN AC_MSG_CHECKING(for MAXHOSTNAMELEN) |