fixed dahdi compatability header from assuming either dahdi or zaptel is installed...

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 bf23f1054ef8de3e351beca6be30008eab31e7da..69f2699cfb5fff8a0846ff8b2910b321ba5797b2 100644 (file)
--- 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 476c7d120764379ac1420d0f7424fa38bf5a31a5..ed2b55f0e181f2f789e08914063a52c0103516ab 100644 (file)
--- 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"