diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-01 14:21:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-01 14:21:49 +0100 |
| commit | abef390dae4e959a0650a1f8ff747dc5d1528305 (patch) | |
| tree | 744badfb1d749ad241691781576a122276896dca /configure.ac | |
| parent | ebf058226120b89bc2735ff72c4c12c14cfa2599 (diff) | |
| parent | b4cdb7c997eee95df96321d11d03cf90e4a6caba (diff) | |
| download | rsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.tar.gz rsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.tar.xz rsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.zip | |
Merge branch 'beta' into master
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/syslogd.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 ea3fb1c8..24e96965 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AC_SUBST(DL_LIBS) AC_HEADER_RESOLV AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h sys/epoll.h sys/prctl.h]) +AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST |