kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the configure script check for sys/poll.h to also provide the result in

Browse Source 
include/asterisk/autoconfig.h.  Also, move the conditional include of sys/poll.h
or asterisk/poll-compat.h into asterisk/config.h instead of the two headers it
existed in before.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-11-17 06:33:07 +00:00
parent 89a49511a4
commit 505499588b
6 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 89354 .
# From configure.ac Revision: 89357 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -12403,11 +12403,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@@ -12447,11 +12449,13 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@@ -15503,6 +15507,11 @@ echo "${ECHO_T}$ac_cv_header_sys_poll_h" >&6; }
fi
if test $ac_cv_header_sys_poll_h = yes; then
HAS_POLL=1
cat >>confdefs.h <<\_ACEOF
#define HAVE_SYS_POLL_H 1
_ACEOF
fi

5
configure.ac
View File

@@ -288,7 +288,10 @@ AC_CHECK_FUNCS([asprintf atexit bzero dup2 endpwent ftruncate getcwd gethostbyna
AC_CHECK_FUNCS([glob])
AC_CHECK_FUNCS([timersub])
AC_CHECK_HEADER([sys/poll.h], [HAS_POLL=1],)
AC_CHECK_HEADER([sys/poll.h],
[HAS_POLL=1]
AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working sys/poll.h]),
)
AC_SUBST(HAS_POLL)
# https support (in main/http.c) uses funopen on BSD systems,

3
include/asterisk/autoconfig.h.in
View File

@@ -840,6 +840,9 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if your system has working sys/poll.h */
#undef HAVE_SYS_POLL_H
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H

2
include/asterisk/channel.h
View File

@@ -125,7 +125,7 @@ References:
#include "asterisk/abstract_jb.h"
#ifdef HAVE_POLL
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#else
#include "asterisk/poll-compat.h"

6
include/asterisk/compat.h
View File

@@ -56,6 +56,12 @@
#include <string.h>
#endif
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#else
#include "asterisk/poll-compat.h"
#endif
#if !defined(HAVE_ASPRINTF) && !defined(__AST_DEBUG_MALLOC)
int asprintf(char **str, const char *fmt, ...);
#endif

2
include/asterisk/io.h
View File

@@ -23,7 +23,7 @@
#ifndef _ASTERISK_IO_H
#define _ASTERISK_IO_H
#ifdef HAVE_POLL
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h> /* For POLL* constants */
#else
#include "asterisk/poll-compat.h"