From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 13 Jun 2008 18:57:24 +0000 (+0000)
Subject: fixed dahdi compatability header from assuming either dahdi or zaptel is installed... 
X-Git-Tag: 1.4.22-rc1~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2266547c6d387a926bd62fe31c64130cbb42b81;p=thirdparty%2Fasterisk.git

fixed dahdi compatability header from assuming either dahdi or zaptel is installed (may not have either)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@122663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/dahdi_compat.h b/include/asterisk/dahdi_compat.h
index bf23f1054e..69f2699cfb 100644
--- a/include/asterisk/dahdi_compat.h
+++ b/include/asterisk/dahdi_compat.h
@@ -22,12 +22,12 @@
 #ifndef DAHDI_COMPAT_H
 #define DAHDI_COMPAT_H
 
-#ifndef HAVE_ZAPTEL
+#ifdef HAVE_DAHDI
 
 #include <dahdi/user.h>
 #include <dahdi/tonezone.h>
 
-#else
+#elif defined(HAVE_ZAPTEL)
 
 #include <zaptel/zaptel.h>
 #include <zaptel/tonezone.h>
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 476c7d1207..ed2b55f0e1 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -27,7 +27,7 @@
 
 /*** MODULEINFO
 	<conflict>win32</conflict>
-	<use>zaptel</use>
+	<use>dahdi</use>
  ***/
 
 #include "asterisk.h"