[svn-commits] rmudgett: branch rmudgett/display_text r306367 - in /team/rmudgett/display_te...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Feb  4 14:04:41 2011
New Revision: 306367

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306367
Log:
Prepare for merging.

Modified:
    team/rmudgett/display_text/channels/sig_pri.h
    team/rmudgett/display_text/configure.ac

Modified: team/rmudgett/display_text/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/display_text/channels/sig_pri.h?view=diff&rev=306367&r1=306366&r2=306367
==============================================================================
--- team/rmudgett/display_text/channels/sig_pri.h (original)
+++ team/rmudgett/display_text/channels/sig_pri.h Fri Feb  4 14:04:41 2011
@@ -31,10 +31,6 @@
 #include "asterisk/ccss.h"
 #include <libpri.h>
 #include <dahdi/user.h>
-
-#if defined(PRI_SUBCMD_DISPLAY_TEXT)
-#define	HAVE_PRI_DISPLAY_TEXT	1	/* BUGBUG delete this when merge branch. */
-#endif
 
 #if defined(HAVE_PRI_CCSS)
 /*! PRI debug message flags when normal PRI debugging is turned on at the command line. */

Modified: team/rmudgett/display_text/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/display_text/configure.ac?view=diff&rev=306367&r1=306366&r2=306367
==============================================================================
--- team/rmudgett/display_text/configure.ac (original)
+++ team/rmudgett/display_text/configure.ac Fri Feb  4 14:04:41 2011
@@ -414,8 +414,8 @@
 AST_EXT_LIB_SETUP([POPT], [popt], [popt])
 AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
 AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
+AST_EXT_LIB_SETUP_DEPENDENT([PRI_DISPLAY_TEXT], [ISDN PRI user display text IE contents during call], [PRI], [pri])
 AST_EXT_LIB_SETUP_DEPENDENT([PRI_MWI], [ISDN PRI Message Waiting Indication], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_DISPLAY_TEXT], [ISDN PRI user display text IE contents during call], [PRI], [pri])
 AST_EXT_LIB_SETUP_DEPENDENT([PRI_MCID], [ISDN PRI Malicious Call ID], [PRI], [pri])
 AST_EXT_LIB_SETUP_DEPENDENT([PRI_CALL_WAITING], [ISDN PRI call waiting supplementary service], [PRI], [pri])
 AST_EXT_LIB_SETUP_DEPENDENT([PRI_AOC_EVENTS], [ISDN PRI advice of charge supplementary service events], [PRI], [pri])