diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:05:28 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:05:28 +0000 |
commit | ae1eb91abecf3d441295824fa3a2b7262ff8c941 (patch) | |
tree | 4b50cc41540b7c5350a214a536d63dd9f03dd95e | |
parent | 90ab2bf707900b45b573d829b64f500531e0d12f (diff) |
Merged revisions 125132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines
allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places
don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it
get app_rpt building again after the DAHDI changes
(closes issue #12911)
Reported by: tzafrir
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@125138 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_dahdibarge.c | 2 | ||||
-rw-r--r-- | apps/app_dahdiras.c | 2 | ||||
-rw-r--r-- | apps/app_dahdiscan.c | 2 | ||||
-rw-r--r-- | apps/app_flash.c | 2 | ||||
-rw-r--r-- | apps/app_meetme.c | 4 | ||||
-rw-r--r-- | apps/app_rpt.c | 8 | ||||
-rw-r--r-- | channels/chan_dahdi.c | 14 | ||||
-rw-r--r-- | codecs/codec_dahdi.c | 3 | ||||
-rwxr-xr-x | configure | 7 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | include/asterisk/dahdi.h | 42 | ||||
-rw-r--r-- | main/Makefile | 4 | ||||
-rw-r--r-- | main/asterisk.c | 2 | ||||
-rw-r--r-- | main/channel.c | 1 | ||||
-rw-r--r-- | res/res_musiconhold.c | 2 | ||||
-rw-r--r-- | res/res_timing_dahdi.c | 3 |
16 files changed, 25 insertions, 78 deletions
diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c index b70b57b30..6487a4ddb 100644 --- a/apps/app_dahdibarge.c +++ b/apps/app_dahdibarge.c @@ -39,7 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index 384607d98..4cc192604 100644 --- a/apps/app_dahdiras.c +++ b/apps/app_dahdiras.c @@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <fcntl.h> -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_dahdiscan.c b/apps/app_dahdiscan.c index b76061395..d1d37fa51 100644 --- a/apps/app_dahdiscan.c +++ b/apps/app_dahdiscan.c @@ -38,7 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_flash.c b/apps/app_flash.c index dd13f414f..46f0e3b8a 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -33,7 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_meetme.c b/apps/app_meetme.c index fc0a08ae0..25cc0727e 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" @@ -292,7 +292,7 @@ static const char *descrip2 = "will be returned in the variable. Upon app completion, MeetMeCount will hangup\n" "the channel, unless priority n+1 exists, in which case priority progress will\n" "continue.\n" -"A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING FUNCTIONALITY.\n"; +""; static const char *descrip3 = " MeetMeAdmin(confno,command[,user]): Run admin command for conference\n" diff --git a/apps/app_rpt.c b/apps/app_rpt.c index cdb7c399e..707c4e169 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -334,12 +334,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/io.h> #include <sys/vfs.h> #include <math.h> -#ifdef OLD_ASTERISK -#include <linux/zaptel.h> -#include <tonezone.h> -#else -#include "asterisk/dahdi.h" -#endif +#include <dahdi/user.h> +#include <dahdi/tonezone.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 0050d6cbf..804d27255 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -58,7 +58,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <math.h> #include <ctype.h> -#include "asterisk/dahdi.h" + +#include <dahdi/user.h> +#include <dahdi/tonezone.h> #ifdef HAVE_PRI #include <libpri.h> @@ -124,16 +126,6 @@ static struct ast_jb_conf default_jbconf = }; static struct ast_jb_conf global_jbconf; -#if !defined(DAHDI_SIG_EM_E1) || (defined(HAVE_PRI) && !defined(DAHDI_SIG_HARDHDLC)) -#error "Your DAHDI is too old. Please update" -#endif - -#ifndef DAHDI_TONEDETECT -/* Work around older code with no tone detect */ -#define DAHDI_EVENT_DTMFDOWN 0 -#define DAHDI_EVENT_DTMFUP 0 -#endif - /* define this to send PRI user-user information elements */ #undef SUPPORT_USERUSER diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 7142a5057..bc13d787c 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -39,7 +39,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <sys/mman.h> -#include "asterisk/dahdi.h" +#include <dahdi/user.h> + #include "asterisk/lock.h" #include "asterisk/translate.h" #include "asterisk/config.h" @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 122234 . +# From configure.ac Revision: 123988 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -45875,7 +45875,10 @@ if test "${host_os}" != "linux-gnu" ; then tonezone_extra="-lm" fi -# new tonezone, version 1.4.0 +if test "x${DAHDI_DIR}" != "x"; then + tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include" +fi + if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then pbxlibdir="" diff --git a/configure.ac b/configure.ac index c1a33783d..847ccda0f 100644 --- a/configure.ac +++ b/configure.ac @@ -1426,7 +1426,10 @@ if test "${host_os}" != "linux-gnu" ; then tonezone_extra="-lm" fi -# new tonezone, version 1.4.0 +if test "x${DAHDI_DIR}" != "x"; then + 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], []) diff --git a/include/asterisk/dahdi.h b/include/asterisk/dahdi.h deleted file mode 100644 index 0a37b891d..000000000 --- a/include/asterisk/dahdi.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Asterisk -- An open source telephony toolkit. - * - * Copyright (C) 2007, Digium, Inc. - * - * See http://www.asterisk.org for more information about - * the Asterisk project. Please do not directly contact - * any of the maintainers of this project for assistance; - * the project provides a web site, mailing lists and IRC - * channels for your use. - * - * This program is free software, distributed under the terms of - * the GNU General Public License Version 2. See the LICENSE file - * at the top of the source tree. - * - * Sometimes one really wonders why we need a copyright - * for less than ten lines of preprocessor directives... - */ - -/*! \file - * \brief Stub to find DAHDI headers -* - * Stub to find the DAHDI headers. The configure script will - * define HAVE_DAHDI_VERSION according to what it has found. - * Applications should include "user.h" and not (directly) - * <foo/user.h> - * For the mapping of version numbers to location see below. - * - */ -#ifndef _AST_DAHDI_H -#define _AST_DAHDI_H - -#ifdef HAVE_DAHDI -#include <sys/ioctl.h> - -/* newer versions install in ${PREFIX}/dahdi */ -#include <dahdi/user.h> -#include <dahdi/tonezone.h> - -#endif /* HAVE_DAHDI */ - -#endif /* _AST_DAHDI_H */ diff --git a/main/Makefile b/main/Makefile index 679f79d6e..06ee26001 100644 --- a/main/Makefile +++ b/main/Makefile @@ -130,10 +130,6 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h $(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm rm ast_expr2.o ast_expr2f.o -channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) -asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) - - ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: ASTCFLAGS+=$(GMIME_INCLUDE) endif diff --git a/main/asterisk.c b/main/asterisk.c index fde3be6a3..9bbeebd25 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -86,8 +86,6 @@ int daemon(int, int); /* defined in libresolv of all places */ #include <sys/loadavg.h> #endif -#include "asterisk/dahdi.h" - #ifdef linux #include <sys/prctl.h> #ifdef HAVE_CAP diff --git a/main/channel.c b/main/channel.c index 7a167208c..361d1fb78 100644 --- a/main/channel.c +++ b/main/channel.c @@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <math.h> #include "asterisk/paths.h" /* use ast_config_AST_SYSTEM_NAME */ -#include "asterisk/dahdi.h" #include "asterisk/pbx.h" #include "asterisk/frame.h" diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 2b1605ec3..92303c3df 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -46,7 +46,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <thread.h> #endif -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c index bc8076690..80b7b4977 100644 --- a/res/res_timing_dahdi.c +++ b/res/res_timing_dahdi.c @@ -36,9 +36,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); #include <fcntl.h> #include <math.h> +#include <dahdi/user.h> + #include "asterisk/module.h" #include "asterisk/timing.h" -#include "asterisk/dahdi.h" #include "asterisk/utils.h" static void *timing_funcs_handle; |