[svn-commits] pcadach: branch pcadach/chan_h323-live r41521 -
/team/pcadach/chan_h323-live/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Aug 30 19:02:47 MST 2006
Author: pcadach
Date: Wed Aug 30 21:02:46 2006
New Revision: 41521
URL: http://svn.digium.com/view/asterisk?rev=41521&view=rev
Log:
Merged revisions 41505 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r41505 | file | 2006-08-31 07:48:04 +0600 (Чтв, 31 Авг 2006) | 2 lines
Update configure script to check for Zaptel VLDTMF support since this will now be required. If you build and don't have Zap stuff, upgrade your zaptel copy. As well - change some minor things so that we get "checking for" and not "checking checking for".
........
Modified:
team/pcadach/chan_h323-live/ (props changed)
team/pcadach/chan_h323-live/acinclude.m4
team/pcadach/chan_h323-live/configure
team/pcadach/chan_h323-live/configure.ac
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 30 21:02:46 2006
@@ -22,3 +22,4 @@
menuselect-tree
autom4te.cache
makeopts.embed_rules
+.makeoptstmp
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 30 21:02:46 2006
@@ -1,1 +1,1 @@
-/trunk:1-41491
+/trunk:1-41506
Modified: team/pcadach/chan_h323-live/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/acinclude.m4?rev=41521&r1=41520&r2=41521&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/acinclude.m4 (original)
+++ team/pcadach/chan_h323-live/acinclude.m4 Wed Aug 30 21:02:46 2006
@@ -2,7 +2,7 @@
AC_DEFUN([AST_GCC_ATTRIBUTE],
[
-AC_MSG_CHECKING(checking for compiler 'attribute $1' support)
+AC_MSG_CHECKING(for compiler 'attribute $1' support)
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM([static int __attribute__(($1)) test(void) {}],
[]),
Modified: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=41521&r1=41520&r2=41521&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Wed Aug 30 21:02:46 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 41180 .
+# From configure.ac Revision: 41194 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -11516,8 +11516,8 @@
done
-echo "$as_me:$LINENO: checking checking for compiler atomic operations" >&5
-echo $ECHO_N "checking checking for compiler atomic operations... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for compiler atomic operations" >&5
+echo $ECHO_N "checking for compiler atomic operations... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11573,8 +11573,8 @@
conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:$LINENO: checking checking for compiler 'attribute pure' support" >&5
-echo $ECHO_N "checking checking for compiler 'attribute pure' support... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for compiler 'attribute pure' support" >&5
+echo $ECHO_N "checking for compiler 'attribute pure' support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11628,8 +11628,8 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: checking checking for compiler 'attribute malloc' support" >&5
-echo $ECHO_N "checking checking for compiler 'attribute malloc' support... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for compiler 'attribute malloc' support" >&5
+echo $ECHO_N "checking for compiler 'attribute malloc' support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11683,8 +11683,8 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: checking checking for compiler 'attribute const' support" >&5
-echo $ECHO_N "checking checking for compiler 'attribute const' support... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for compiler 'attribute const' support" >&5
+echo $ECHO_N "checking for compiler 'attribute const' support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11738,8 +11738,8 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: checking checking for compiler 'attribute unused' support" >&5
-echo $ECHO_N "checking checking for compiler 'attribute unused' support... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for compiler 'attribute unused' support" >&5
+echo $ECHO_N "checking for compiler 'attribute unused' support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11793,8 +11793,8 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: checking checking for compiler 'attribute always_inline' support" >&5
-echo $ECHO_N "checking checking for compiler 'attribute always_inline' support... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for compiler 'attribute always_inline' support" >&5
+echo $ECHO_N "checking for compiler 'attribute always_inline' support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11848,8 +11848,8 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: checking checking for -ffunction-sections support" >&5
-echo $ECHO_N "checking checking for -ffunction-sections support... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for -ffunction-sections support" >&5
+echo $ECHO_N "checking for -ffunction-sections support... $ECHO_C" >&6
saved_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} -ffunction-sections"
cat >conftest.$ac_ext <<_ACEOF
@@ -11892,8 +11892,8 @@
echo "${ECHO_T}yes" >&6
saved_LDFLAGS="${LDFLAGS}"
LDFLAGS="${LDFLAGS} -Wl,--gc-sections"
- echo "$as_me:$LINENO: checking checking for --gc-sections support" >&5
-echo $ECHO_N "checking checking for --gc-sections support... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --gc-sections support" >&5
+echo $ECHO_N "checking for --gc-sections support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11958,8 +11958,8 @@
-echo "$as_me:$LINENO: checking checking for res_ninit" >&5
-echo $ECHO_N "checking checking for res_ninit... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for res_ninit" >&5
+echo $ECHO_N "checking for res_ninit... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12014,8 +12014,8 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:$LINENO: checking checking for RTLD_NOLOAD" >&5
-echo $ECHO_N "checking checking for RTLD_NOLOAD... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for RTLD_NOLOAD" >&5
+echo $ECHO_N "checking for RTLD_NOLOAD... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -14410,8 +14410,8 @@
if test "${IMAP_TK_DIR}" = ""; then
IMAP_TK_DIR=`pwd`"/../imap-2004g"
fi
- echo "$as_me:$LINENO: checking checking for UW IMAP Toolkit c-client library" >&5
-echo $ECHO_N "checking checking for UW IMAP Toolkit c-client library... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for UW IMAP Toolkit c-client library" >&5
+echo $ECHO_N "checking for UW IMAP Toolkit c-client library... $ECHO_C" >&6
saved_cppflags="${CPPFLAGS}"
saved_libs="${LIBS}"
if test -f ${IMAP_TK_DIR}/c-client/LDFLAGS ; then
@@ -14655,8 +14655,8 @@
if test "${USE_KDE}" != "no"; then
- echo "$as_me:$LINENO: checking checking for crashHandler in -lkdecore" >&5
-echo $ECHO_N "checking checking for crashHandler in -lkdecore... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for crashHandler in -lkdecore" >&5
+echo $ECHO_N "checking for crashHandler in -lkdecore... $ECHO_C" >&6
saved_libs="${LIBS}"
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} -I${KDE_DIR}/include"
@@ -21633,8 +21633,8 @@
if test "${USE_QT}" != "no"; then
- echo "$as_me:$LINENO: checking checking for QDate in -lqt" >&5
-echo $ECHO_N "checking checking for QDate in -lqt... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for QDate in -lqt" >&5
+echo $ECHO_N "checking for QDate in -lqt... $ECHO_C" >&6
saved_libs="${LIBS}"
saved_cppflags="${CPPFLAGS}"
if test "x${QT_DIR}" != "x"; then
@@ -25670,8 +25670,8 @@
if test "${USE_VPB}" != "no"; then
- echo "$as_me:$LINENO: checking checking for vpb_open in -lvpb" >&5
-echo $ECHO_N "checking checking for vpb_open in -lvpb... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for vpb_open in -lvpb" >&5
+echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6
saved_libs="${LIBS}"
saved_cppflags="${CPPFLAGS}"
if test "x${VPB_DIR}" != "x"; then
@@ -26191,8 +26191,8 @@
if test "${USE_ZAPTEL}" != "no"; then
- echo "$as_me:$LINENO: checking checking for zt_transcode_header in zaptel.h" >&5
-echo $ECHO_N "checking checking for zt_transcode_header in zaptel.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ZT_TONE_DTMF_BASE in zaptel.h" >&5
+echo $ECHO_N "checking for ZT_TONE_DTMF_BASE in zaptel.h... $ECHO_C" >&6
saved_cppflags="${CPPFLAGS}"
if test "x${ZAPTEL_DIR}" != "x"; then
CPPFLAGS="${CPPFLAGS} -I${ZAPTEL_DIR}/include"
@@ -26208,7 +26208,7 @@
int
main ()
{
-struct zt_transcode_header test;
+int foo = ZT_TONE_DTMF_BASE;
;
return 0;
}
Modified: team/pcadach/chan_h323-live/configure.ac
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure.ac?rev=41521&r1=41520&r2=41521&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure.ac (original)
+++ team/pcadach/chan_h323-live/configure.ac Wed Aug 30 21:02:46 2006
@@ -242,7 +242,7 @@
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strndup strnlen strrchr strsep strspn strstr strtol unsetenv utime strtoq strcasestr asprintf vasprintf])
-AC_MSG_CHECKING(checking for compiler atomic operations)
+AC_MSG_CHECKING(for compiler atomic operations)
AC_LINK_IFELSE(
AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);]),
AC_MSG_RESULT(yes)
@@ -256,7 +256,7 @@
AST_GCC_ATTRIBUTE(unused)
AST_GCC_ATTRIBUTE(always_inline)
-AC_MSG_CHECKING(checking for -ffunction-sections support)
+AC_MSG_CHECKING(for -ffunction-sections support)
saved_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} -ffunction-sections"
AC_COMPILE_IFELSE(
@@ -264,7 +264,7 @@
AC_MSG_RESULT(yes)
[saved_LDFLAGS="${LDFLAGS}"]
[LDFLAGS="${LDFLAGS} -Wl,--gc-sections"]
- AC_MSG_CHECKING(checking for --gc-sections support)
+ AC_MSG_CHECKING(for --gc-sections support)
AC_LINK_IFELSE(
AC_LANG_PROGRAM([], [int x = 1;]),
AC_MSG_RESULT(yes)
@@ -279,7 +279,7 @@
AC_SUBST(GC_CFLAGS)
AC_SUBST(GC_LDFLAGS)
-AC_MSG_CHECKING(checking for res_ninit)
+AC_MSG_CHECKING(for res_ninit)
AC_LINK_IFELSE(
AC_LANG_PROGRAM([#include <resolv.h>],
[int foo = res_ninit(NULL);]),
@@ -288,7 +288,7 @@
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(checking for RTLD_NOLOAD)
+AC_MSG_CHECKING(for RTLD_NOLOAD)
AC_LINK_IFELSE(
AC_LANG_PROGRAM([#include <dlfcn.h>],
[int foo = RTLD_NOLOAD;]),
@@ -356,7 +356,7 @@
if test "${IMAP_TK_DIR}" = ""; then
IMAP_TK_DIR=`pwd`"/../imap-2004g"
fi
- AC_MSG_CHECKING(checking for UW IMAP Toolkit c-client library)
+ AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
saved_cppflags="${CPPFLAGS}"
saved_libs="${LIBS}"
if test -f ${IMAP_TK_DIR}/c-client/LDFLAGS ; then
@@ -502,7 +502,7 @@
AC_LANG_PUSH(C++)
if test "${USE_KDE}" != "no"; then
- AC_MSG_CHECKING(checking for crashHandler in -lkdecore)
+ AC_MSG_CHECKING(for crashHandler in -lkdecore)
saved_libs="${LIBS}"
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} -I${KDE_DIR}/include"
@@ -736,7 +736,7 @@
AC_LANG_PUSH(C++)
if test "${USE_QT}" != "no"; then
- AC_MSG_CHECKING(checking for QDate in -lqt)
+ AC_MSG_CHECKING(for QDate in -lqt)
saved_libs="${LIBS}"
saved_cppflags="${CPPFLAGS}"
if test "x${QT_DIR}" != "x"; then
@@ -843,7 +843,7 @@
AC_LANG_PUSH(C++)
if test "${USE_VPB}" != "no"; then
- AC_MSG_CHECKING(checking for vpb_open in -lvpb)
+ AC_MSG_CHECKING(for vpb_open in -lvpb)
saved_libs="${LIBS}"
saved_cppflags="${CPPFLAGS}"
if test "x${VPB_DIR}" != "x"; then
@@ -893,7 +893,7 @@
AST_EXT_LIB_CHECK([ZLIB], [z], [compress], [zlib.h])
if test "${USE_ZAPTEL}" != "no"; then
- AC_MSG_CHECKING(checking for zt_transcode_header in zaptel.h)
+ AC_MSG_CHECKING(for ZT_TONE_DTMF_BASE in zaptel.h)
saved_cppflags="${CPPFLAGS}"
if test "x${ZAPTEL_DIR}" != "x"; then
CPPFLAGS="${CPPFLAGS} -I${ZAPTEL_DIR}/include"
@@ -902,7 +902,7 @@
[
AC_LANG_PROGRAM(
[#include <zaptel/zaptel.h>],
- [struct zt_transcode_header test;])
+ [int foo = ZT_TONE_DTMF_BASE;])
],
[ AC_MSG_RESULT(yes)
ac_cv_zaptel_h="yes"
More information about the svn-commits
mailing list