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: https://origsvn.digium.com/svn/asterisk/branches/1.4@125132 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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 */
 

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 */