kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 127767 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r127767 | kpfleming | 2008-07-03 11:22:02 -0500 (Thu, 03 Jul 2008) | 2 lines

some minor fixes found while working on issue #12911 (and block the rev from 1.4 since the equivalent is already here)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@127778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-03 16:24:57 +00:00
parent 1eaf84a6e3
commit eeda7c996b
4 changed files with 2752 additions and 9141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@@ -192,7 +192,7 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
$1_HEADER_FOUND="1" $1_HEADER_FOUND="1"
else # check for the header else # check for the header
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE} $6" CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0]) AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
fi fi

11882
configure vendored
View File

File diff suppressed because it is too large Load Diff

6
configure.ac
View File

@@ -1390,11 +1390,7 @@ if test "${host_os}" != "linux-gnu" ; then
tonezone_extra="-lm" tonezone_extra="-lm"
fi fi
if test "x${DAHDI_DIR}" != "x"; then AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra} ${DAHDI_INCLUDE}])
tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
fi
AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra}])
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], []) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])

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

@@ -1157,6 +1157,9 @@
#ifndef _POSIX_PTHREAD_SEMANTICS #ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS
#endif #endif
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Define like PROTOTYPES; this can be used by system headers. */ /* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES #undef __PROTOTYPES