[svn-commits] branch group/rtpjitterbuffer r26456 - in
/team/group/rtpjitterbuffer: ./ apps...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed May 10 06:50:20 MST 2006
Author: russell
Date: Wed May 10 08:50:19 2006
New Revision: 26456
URL: http://svn.digium.com/view/asterisk?rev=26456&view=rev
Log:
Merged revisions 25914,25924-25925,25928-25930,25959,25989,26016-26017,26019-26020,26046-26049,26051,26054-26055,26091-26094,26103,26131,26166,26170,26216,26250,26281-26283,26314,26345-26347,26378,26416-26417,26441,26451 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r25914 | rizzo | 2006-05-09 04:03:52 -0400 (Tue, 09 May 2006) | 3 lines
remove trailing whitespace
................
r25924 | kpfleming | 2006-05-09 04:11:41 -0400 (Tue, 09 May 2006) | 2 lines
remove API function that was added and never used
................
r25925 | rizzo | 2006-05-09 04:16:07 -0400 (Tue, 09 May 2006) | 3 lines
misc fixups
................
r25928 | rizzo | 2006-05-09 04:31:42 -0400 (Tue, 09 May 2006) | 10 lines
large rewrite of the extension matching code,
prerequisite to implement the specification defined yesterday.
While I have been using this code for months now, the change is large
so expect some instability.
Also the new specification (sorting extension by match length etc.)
is not implemented yet.
................
r25929 | markster | 2006-05-09 04:44:50 -0400 (Tue, 09 May 2006) | 2 lines
Make menuselect be able to show what the modules are
................
r25930 | markster | 2006-05-09 04:45:37 -0400 (Tue, 09 May 2006) | 2 lines
Oops
................
r25959 | markster | 2006-05-09 05:47:22 -0400 (Tue, 09 May 2006) | 2 lines
Make sure we update parameters correctly with reinvite
................
r25989 | russell | 2006-05-09 06:43:08 -0400 (Tue, 09 May 2006) | 8 lines
change the check for zaptel to only check for linux/zaptel.h on Linux, and
zaptel.h otherwise
If you did ./configure --with-tonezone=/usr/local/ on FreeBSD, it would run
the first macro which would not find it, but it wouldn't make it to the second
macro because the first check saw that --with-tonezone was specified and would
exit with error
................
r26016 | rizzo | 2006-05-09 07:27:33 -0400 (Tue, 09 May 2006) | 3 lines
do not use a variable name that hides a useful library symbol (time())
................
r26017 | rizzo | 2006-05-09 07:29:34 -0400 (Tue, 09 May 2006) | 2 lines
change some log_warning into log_debug
................
r26019 | markster | 2006-05-09 07:44:50 -0400 (Tue, 09 May 2006) | 2 lines
Make SIP early media work more efficiently without so many reinvites
................
r26020 | rizzo | 2006-05-09 07:45:26 -0400 (Tue, 09 May 2006) | 3 lines
add default values for CPPFLAGS and LDFLAGS on FreeBSD
................
r26046 | russell | 2006-05-09 09:14:37 -0400 (Tue, 09 May 2006) | 2 lines
add regenerated configure script
................
r26047 | kpfleming | 2006-05-09 09:19:43 -0400 (Tue, 09 May 2006) | 2 lines
update to include latest FreeBSD changes
................
r26048 | kpfleming | 2006-05-09 09:20:52 -0400 (Tue, 09 May 2006) | 2 lines
ignore some more auto-generated files
................
r26049 | kpfleming | 2006-05-09 09:26:50 -0400 (Tue, 09 May 2006) | 2 lines
use aclocal version 1.9 instead of 1.4 :-)
................
r26051 | bweschke | 2006-05-09 09:33:54 -0400 (Tue, 09 May 2006) | 11 lines
Merged revisions 26050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r26050 | bweschke | 2006-05-09 08:28:39 -0500 (Tue, 09 May 2006) | 3 lines
Correct memory leak in find_user_realtime #7118 (fnordian)
........
................
r26054 | rizzo | 2006-05-09 09:52:01 -0400 (Tue, 09 May 2006) | 3 lines
normalize code, remove some useless casts
................
r26055 | rizzo | 2006-05-09 09:55:33 -0400 (Tue, 09 May 2006) | 3 lines
remove duplicate atof() invokation
................
r26091 | bweschke | 2006-05-09 10:21:33 -0400 (Tue, 09 May 2006) | 3 lines
This app is deprecated in /trunk, and thus, the change should not come forward.
................
r26092 | kpfleming | 2006-05-09 10:25:31 -0400 (Tue, 09 May 2006) | 2 lines
minor cleanups and removal of duplicate prototypes
................
r26093 | kpfleming | 2006-05-09 10:25:57 -0400 (Tue, 09 May 2006) | 3 lines
use an enum for control frame types
support sending control frames with payload
................
r26094 | kpfleming | 2006-05-09 10:43:00 -0400 (Tue, 09 May 2006) | 2 lines
remove rule for running bootstrap, it's only safe to run it manually now
................
r26103 | markster | 2006-05-09 11:01:10 -0400 (Tue, 09 May 2006) | 2 lines
Make sure that we don't accept an answer on an inbound call and don't permit asterisk to answer an outbound call
................
r26131 | oej | 2006-05-09 11:17:12 -0400 (Tue, 09 May 2006) | 2 lines
Formatting fix
................
r26166 | rizzo | 2006-05-09 12:19:24 -0400 (Tue, 09 May 2006) | 5 lines
clear memory before passing to ASTOBJ_INIT
Mayne it is unnecessary, but otherwise there code believes
the mutex is already initialized.
................
r26170 | kpfleming | 2006-05-09 12:24:07 -0400 (Tue, 09 May 2006) | 2 lines
various doxygen fixes
................
r26216 | rizzo | 2006-05-09 14:34:30 -0400 (Tue, 09 May 2006) | 14 lines
implement the new sorting algorithm for extensions,
see the documentation near functions ext_cmp1() and ext_cmp().
All sorting decisions are now in one place so it is easy
to revise them.
NOTE
the major change is that now most specific patterns come first,
so there might be differences in how diaplans behave.
If you really really really need to revert to the old sorting order
while you adapt your dialplan, you can uncomment the '#if 0' line
in ext_cmp().
................
r26250 | bweschke | 2006-05-09 22:57:20 -0400 (Tue, 09 May 2006) | 3 lines
Implement new support for "meetme list <confno> concise"
................
r26281 | rizzo | 2006-05-10 03:13:23 -0400 (Wed, 10 May 2006) | 3 lines
prevent a warning for uninitialized variable.
................
r26282 | rizzo | 2006-05-10 03:19:29 -0400 (Wed, 10 May 2006) | 3 lines
indentation fixes
................
r26283 | rizzo | 2006-05-10 03:45:14 -0400 (Wed, 10 May 2006) | 3 lines
document special character interpretation.
................
r26314 | markster | 2006-05-10 05:09:16 -0400 (Wed, 10 May 2006) | 3 lines
Allow media to go directly between IAX endpoints while signalling still
goes through the existing path.
................
r26345 | rizzo | 2006-05-10 06:10:03 -0400 (Wed, 10 May 2006) | 3 lines
use 'switch' insteaf of multiple 'if'
................
r26346 | rizzo | 2006-05-10 06:41:38 -0400 (Wed, 10 May 2006) | 7 lines
provide a correct return value in case everything goes well,
so you won't get random failures running menuselect.
Detected by -Wall -Werror
................
r26347 | rizzo | 2006-05-10 06:48:29 -0400 (Wed, 10 May 2006) | 3 lines
add missing rule
................
r26378 | rizzo | 2006-05-10 07:38:43 -0400 (Wed, 10 May 2006) | 6 lines
fix a couple of misindented lines;
prepare reduce nesting level in a couple of blocks by
inverting an if () statement (indentation change to be committed
separately).
................
r26416 | rizzo | 2006-05-10 08:17:25 -0400 (Wed, 10 May 2006) | 3 lines
fix indentation of two large blocks
................
r26417 | kpfleming | 2006-05-10 08:24:11 -0400 (Wed, 10 May 2006) | 4 lines
ensure that control frames with payload can be sent to channel drivers via ->indicate()
update iax2_indicate to pass control frame payload to the connected channel
add an API call for sending an indication with payload, and use it for control frames with payload
................
r26441 | russell | 2006-05-10 09:05:17 -0400 (Wed, 10 May 2006) | 3 lines
remove a debug message and make the exit keys not be case sensitive
inside of a category menu
................
r26451 | russell | 2006-05-10 09:22:15 -0400 (Wed, 10 May 2006) | 4 lines
remove almost all of the checks of the result from ast_strdupa() or alloca().
As it turns out, all of these checks were useless, because alloca will never
return NULL.
................
Modified:
team/group/rtpjitterbuffer/ (props changed)
team/group/rtpjitterbuffer/Makefile
team/group/rtpjitterbuffer/aclocal.m4
team/group/rtpjitterbuffer/app.c
team/group/rtpjitterbuffer/apps/app_amd.c
team/group/rtpjitterbuffer/apps/app_authenticate.c
team/group/rtpjitterbuffer/apps/app_chanspy.c
team/group/rtpjitterbuffer/apps/app_db.c
team/group/rtpjitterbuffer/apps/app_dial.c
team/group/rtpjitterbuffer/apps/app_dictate.c
team/group/rtpjitterbuffer/apps/app_directory.c
team/group/rtpjitterbuffer/apps/app_disa.c
team/group/rtpjitterbuffer/apps/app_exec.c
team/group/rtpjitterbuffer/apps/app_externalivr.c
team/group/rtpjitterbuffer/apps/app_festival.c
team/group/rtpjitterbuffer/apps/app_hasnewvoicemail.c
team/group/rtpjitterbuffer/apps/app_image.c
team/group/rtpjitterbuffer/apps/app_meetme.c
team/group/rtpjitterbuffer/apps/app_mixmonitor.c
team/group/rtpjitterbuffer/apps/app_osplookup.c
team/group/rtpjitterbuffer/apps/app_page.c
team/group/rtpjitterbuffer/apps/app_playback.c
team/group/rtpjitterbuffer/apps/app_privacy.c
team/group/rtpjitterbuffer/apps/app_queue.c
team/group/rtpjitterbuffer/apps/app_random.c
team/group/rtpjitterbuffer/apps/app_read.c
team/group/rtpjitterbuffer/apps/app_readfile.c
team/group/rtpjitterbuffer/apps/app_realtime.c
team/group/rtpjitterbuffer/apps/app_record.c
team/group/rtpjitterbuffer/apps/app_sayunixtime.c
team/group/rtpjitterbuffer/apps/app_senddtmf.c
team/group/rtpjitterbuffer/apps/app_sendtext.c
team/group/rtpjitterbuffer/apps/app_setcallerid.c
team/group/rtpjitterbuffer/apps/app_skel.c
team/group/rtpjitterbuffer/apps/app_speech_utils.c
team/group/rtpjitterbuffer/apps/app_stack.c
team/group/rtpjitterbuffer/apps/app_talkdetect.c
team/group/rtpjitterbuffer/apps/app_transfer.c
team/group/rtpjitterbuffer/apps/app_url.c
team/group/rtpjitterbuffer/apps/app_userevent.c
team/group/rtpjitterbuffer/apps/app_verbose.c
team/group/rtpjitterbuffer/apps/app_voicemail.c
team/group/rtpjitterbuffer/apps/app_while.c
team/group/rtpjitterbuffer/apps/app_zapras.c
team/group/rtpjitterbuffer/apps/app_zapscan.c
team/group/rtpjitterbuffer/build_tools/menuselect.c
team/group/rtpjitterbuffer/build_tools/menuselect.h
team/group/rtpjitterbuffer/build_tools/menuselect_curses.c
team/group/rtpjitterbuffer/build_tools/prep_moduledeps
team/group/rtpjitterbuffer/callerid.c
team/group/rtpjitterbuffer/channel.c
team/group/rtpjitterbuffer/channels/chan_agent.c
team/group/rtpjitterbuffer/channels/chan_alsa.c
team/group/rtpjitterbuffer/channels/chan_features.c
team/group/rtpjitterbuffer/channels/chan_iax2.c
team/group/rtpjitterbuffer/channels/chan_local.c
team/group/rtpjitterbuffer/channels/chan_mgcp.c
team/group/rtpjitterbuffer/channels/chan_nbs.c
team/group/rtpjitterbuffer/channels/chan_oss.c
team/group/rtpjitterbuffer/channels/chan_phone.c
team/group/rtpjitterbuffer/channels/chan_sip.c
team/group/rtpjitterbuffer/channels/chan_skinny.c
team/group/rtpjitterbuffer/channels/chan_vpb.c
team/group/rtpjitterbuffer/channels/chan_zap.c
team/group/rtpjitterbuffer/channels/iax2.h
team/group/rtpjitterbuffer/configs/iax.conf.sample
team/group/rtpjitterbuffer/configure
team/group/rtpjitterbuffer/configure.ac
team/group/rtpjitterbuffer/dsp.c
team/group/rtpjitterbuffer/funcs/func_cut.c
team/group/rtpjitterbuffer/include/asterisk/app.h
team/group/rtpjitterbuffer/include/asterisk/astosp.h
team/group/rtpjitterbuffer/include/asterisk/channel.h
team/group/rtpjitterbuffer/include/asterisk/frame.h
team/group/rtpjitterbuffer/include/asterisk/module.h
team/group/rtpjitterbuffer/include/asterisk/pbx.h
team/group/rtpjitterbuffer/include/asterisk/rtp.h
team/group/rtpjitterbuffer/include/asterisk/translate.h
team/group/rtpjitterbuffer/include/asterisk/utils.h
team/group/rtpjitterbuffer/indications.c
team/group/rtpjitterbuffer/loader.c
team/group/rtpjitterbuffer/logger.c
team/group/rtpjitterbuffer/manager.c
team/group/rtpjitterbuffer/mxml/ (props changed)
team/group/rtpjitterbuffer/netsock.c
team/group/rtpjitterbuffer/pbx.c
team/group/rtpjitterbuffer/pbx/ael/ (props changed)
team/group/rtpjitterbuffer/pbx/pbx_config.c
team/group/rtpjitterbuffer/pbx/pbx_dundi.c
team/group/rtpjitterbuffer/res/res_agi.c
team/group/rtpjitterbuffer/res/res_clioriginate.c
team/group/rtpjitterbuffer/res/res_config_odbc.c
team/group/rtpjitterbuffer/res/res_config_pgsql.c
team/group/rtpjitterbuffer/res/res_convert.c
team/group/rtpjitterbuffer/res/res_features.c
team/group/rtpjitterbuffer/res/res_monitor.c
team/group/rtpjitterbuffer/res/res_smdi.c
team/group/rtpjitterbuffer/rtp.c
team/group/rtpjitterbuffer/say.c
team/group/rtpjitterbuffer/strcompat.c
Propchange: team/group/rtpjitterbuffer/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/group/rtpjitterbuffer/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/group/rtpjitterbuffer/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 10 08:50:19 2006
@@ -1,1 +1,1 @@
-/trunk:1-25904
+/trunk:1-26454
Modified: team/group/rtpjitterbuffer/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/rtpjitterbuffer/Makefile?rev=26456&r1=26455&r2=26456&view=diff
==============================================================================
--- team/group/rtpjitterbuffer/Makefile (original)
+++ team/group/rtpjitterbuffer/Makefile Wed May 10 08:50:19 2006
@@ -438,9 +438,6 @@
all: config.status menuselect.makeopts cleantest depend asterisk subdirs
-configure:
- - at ./bootstrap.sh
-
config.status: configure
@CFLAGS="" ./configure
@echo "****"
@@ -486,7 +483,7 @@
include .tags-depend
endif
-ast_expr2.c:
+ast_expr2.c ast_expr2.h:
bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
ast_expr2f.c:
Modified: team/group/rtpjitterbuffer/aclocal.m4
URL: http://svn.digium.com/view/asterisk/team/group/rtpjitterbuffer/aclocal.m4?rev=26456&r1=26455&r2=26456&view=diff
==============================================================================
--- team/group/rtpjitterbuffer/aclocal.m4 (original)
+++ team/group/rtpjitterbuffer/aclocal.m4 Wed May 10 08:50:19 2006
@@ -1,922 +1,14 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
-# AST_EXT_LIB([NAME], [FUNCTION], [package header], [package symbol name], [package friendly name], [additional LIB data])
-
-AC_DEFUN([AST_EXT_LIB],
-[
-AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $5 files in PATH]),[
-case ${withval} in
- n|no)
- USE_$1=no
- ;;
- y|ye|yes)
- $1_MANDATORY="yes"
- ;;
- *)
- $1_DIR="${withval}"
- $1_MANDATORY="yes"
- ;;
-esac
-])
-
-PBX_LIB$1=0
-
-if test "${USE_$1}" != "no"; then
- libdir=""
- if test "x${$1_DIR}" != "x"; then
- libdir="-L${$1_DIR}/lib"
- fi
- AC_CHECK_LIB([$1], [$2], [:], [], ${libdir} $6)
-
- if test "${ac_cv_lib_$1_$2}" = "yes"; then
- $1_LIB="-l$1 $6"
- $4_HEADER_FOUND="1"
- if test "x${$1_DIR}" != "x"; then
- $1_LIB="${libdir} ${$1_LIB}"
- $1_INCLUDE="-I${$1_DIR}/include"
- if test "x$3" != "x" ; then
- AC_CHECK_HEADER([${$1_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
- fi
- else
- if test "x$3" != "x" ; then
- AC_CHECK_HEADER([$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
- fi
- fi
- if test "x${$4_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${$1_MANDATORY}" ;
- then
- echo " ***"
- echo " *** It appears that you do not have the $1 development package installed."
- echo " *** Please install it to include $5 support, or re-run configure"
- echo " *** without explicitly specifying --with-$1"
- exit 1
- fi
- $1_LIB=""
- $1_INCLUDE=""
- PBX_LIB$1=0
- else
- PBX_LIB$1=1
- AC_DEFINE_UNQUOTED([HAVE_$4], 1, [Define to indicate the $5 library])
- fi
- elif test ! -z "${$1_MANDATORY}";
- then
- echo "***"
- echo "*** The $5 installation on this system appears to be broken."
- echo "*** Either correct the installation, or run configure"
- echo "*** without explicity specifying --with-$1"
- exit 1
- fi
-fi
-AC_SUBST([$1_LIB])
-AC_SUBST([$1_INCLUDE])
-AC_SUBST([PBX_LIB$1])
-])
-
-
-AC_DEFUN(
-[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
- GNU_MAKE='Not Found' ;
- for a in make gmake gnumake ; do
- if test -z "$a" ; then continue ; fi ;
- if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
- GNU_MAKE=$a ;
- break;
- fi
- done ;
-) ;
-if test "x$GNU_MAKE" = "xNot Found" ; then
- echo " *** Please install GNU make. It is required to build Asterisk!"
- exit 1
-fi
-AC_SUBST([GNU_MAKE])
-])
-
-# lib-prefix.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
- AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_LIB_ARG_WITH([lib-prefix],
-[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
- --without-lib-prefix don't search for libraries in includedir and libdir],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/lib"
- fi
- fi
-])
- if test $use_additional = yes; then
- dnl Potentially add $additional_includedir to $CPPFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- for x in $CPPFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $CPPFLAGS.
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- dnl Potentially add $additional_libdir to $LDFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/lib"; then
- haveit=
- for x in $LDFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LDFLAGS.
- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
- dnl Unfortunately, prefix and exec_prefix get only finally determined
- dnl at the end of configure.
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- $1
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-])
-
-# lib-link.m4 serial 6 (gettext-0.14.3)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ(2.50)
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- define([Name],[translit([$1],[./-], [___])])
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
- ac_cv_lib[]Name[]_libs="$LIB[]NAME"
- ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
- ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
- ])
- LIB[]NAME="$ac_cv_lib[]Name[]_libs"
- LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
- INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
- dnl results of this search when this library appears as a dependency.
- HAVE_LIB[]NAME=yes
- undefine([Name])
- undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- define([Name],[translit([$1],[./-], [___])])
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
- dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
- dnl accordingly.
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
- dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
- dnl because if the user has installed lib[]Name and not disabled its use
- dnl via --without-lib[]Name-prefix, he wants to use it.
- ac_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LIB[]NAME"
- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
- LIBS="$ac_save_LIBS"
- ])
- if test "$ac_cv_lib[]Name" = yes; then
- HAVE_LIB[]NAME=yes
- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
- AC_MSG_CHECKING([how to link with lib[]$1])
- AC_MSG_RESULT([$LIB[]NAME])
- else
- HAVE_LIB[]NAME=no
- dnl If $LIB[]NAME didn't lead to a usable library, we don't need
- dnl $INC[]NAME either.
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIB[]NAME=
- LTLIB[]NAME=
- fi
- AC_SUBST([HAVE_LIB]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- undefine([Name])
- undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
- dnl Tell automake >= 1.10 to complain if config.rpath is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
- AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
- AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
- ])
- wl="$acl_cv_wl"
- libext="$acl_cv_libext"
- shlibext="$acl_cv_shlibext"
- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- hardcode_direct="$acl_cv_hardcode_direct"
- hardcode_minus_L="$acl_cv_hardcode_minus_L"
- dnl Determine whether the user wants rpath handling at all.
- AC_ARG_ENABLE(rpath,
- [ --disable-rpath do not hardcode runtime library paths],
- :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_LIB_ARG_WITH([lib$1-prefix],
-[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
- --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/lib"
- fi
- fi
-])
- dnl Search the library and its dependencies in $additional_libdir and
- dnl $LDFLAGS. Using breadth-first-seach.
- LIB[]NAME=
- LTLIB[]NAME=
- INC[]NAME=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='$1 $2'
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
- dnl or AC_LIB_HAVE_LINKFLAGS call.
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
- else
- dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
- dnl that this library doesn't exist. So just drop it.
- :
- fi
- else
- dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME/$LTLIBNAME.
- found_dir=
- found_la=
- found_so=
- found_a=
- if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
- found_dir="$additional_libdir"
- found_so="$additional_libdir/lib$name.$shlibext"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
- else
- if test -f "$additional_libdir/lib$name.$libext"; then
- found_dir="$additional_libdir"
- found_a="$additional_libdir/lib$name.$libext"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
- found_dir="$dir"
- found_so="$dir/lib$name.$shlibext"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
- else
- if test -f "$dir/lib$name.$libext"; then
- found_dir="$dir"
- found_a="$dir/lib$name.$libext"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- dnl Found the library.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
- dnl No hardcoding is needed.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- dnl The hardcoding into $LIBNAME is system dependent.
- if test "$hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding. This affects only
- dnl very old systems.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- fi
- fi
- dnl Assume the include files are nearby.
- additional_includedir=
- case "$found_dir" in
- */lib | */lib/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- dnl Potentially add $additional_includedir to $INCNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's /usr/local/include and we are using GCC on Linux,
- dnl 3. if it's already present in $CPPFLAGS or the already
- dnl constructed $INCNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $INCNAME.
- INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
- fi
- fi
[... 7520 lines stripped ...]
More information about the svn-commits
mailing list