diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 22:21:30 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 22:21:30 +0000 |
| commit | 0aeeffaa0956845b7dd0941df54eda3411329dea (patch) | |
| tree | 7aee232cca984b03627beaca4794986dea17c387 /include/asterisk | |
| parent | e8c34cc34baa6113303d5ca1574c3aed5f2dbeed (diff) | |
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/branches/1.4@125132 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/dahdi_compat.h | 4 | ||||
| -rw-r--r-- | include/asterisk/tonezone_compat.h | 35 |
2 files changed, 36 insertions, 3 deletions
diff --git a/include/asterisk/dahdi_compat.h b/include/asterisk/dahdi_compat.h index 69f2699cf..9c8f6e829 100644 --- a/include/asterisk/dahdi_compat.h +++ b/include/asterisk/dahdi_compat.h @@ -22,15 +22,13 @@ #ifndef DAHDI_COMPAT_H #define DAHDI_COMPAT_H -#ifdef HAVE_DAHDI +#if defined(HAVE_DAHDI) #include <dahdi/user.h> -#include <dahdi/tonezone.h> #elif defined(HAVE_ZAPTEL) #include <zaptel/zaptel.h> -#include <zaptel/tonezone.h> /* Compiling against Zaptel instead of DAHDI */ diff --git a/include/asterisk/tonezone_compat.h b/include/asterisk/tonezone_compat.h new file mode 100644 index 000000000..6be160cfb --- /dev/null +++ b/include/asterisk/tonezone_compat.h @@ -0,0 +1,35 @@ +/* + * Asterisk -- An open source telephony toolkit. + * + * Copyright (C) 2008, 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. + */ + +/*! + * \file + * \brief Find tonezone header in the right place (DAHDI or Zaptel) + */ + +#ifndef TONEZONE_COMPAT_H +#define TONEZONE_COMPAT_H + +#if defined(HAVE_DAHDI) + +#include <dahdi/tonezone.h> + +#elif defined(HAVE_ZAPTEL) + +#include <zaptel/tonezone.h> + +#endif + +#endif /* TONEZONE_COMPAT_H */ |