Merged revisions 132641 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132641 | kpfleming | 2008-07-22 14:49:11 -0500 (Tue, 22 Jul 2008) | 2 lines

use renamed libpri API call for controlling this feature (was improperly named before)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@132643 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 28 insertions, 28 deletions

diff --git a/configure b/configure
index f2c0b00a7..2e86d24a8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 130040 .
+# From configure.ac Revision: 132390 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -39064,19 +39064,19 @@ fi
 
 
 
-if test "x${PBX_PRI_INBANDRELEASE}" != "x1" -a "${USE_PRI_INBANDRELEASE}" != "no"; then
+if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" != "no"; then
    pbxlibdir=""
-   # if --with-PRI_INBANDRELEASE=DIR has been specified, use it.
-   if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then
-      if test -d ${PRI_INBANDRELEASE_DIR}/lib; then
-      	 pbxlibdir="-L${PRI_INBANDRELEASE_DIR}/lib"
+   # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it.
+   if test "x${PRI_INBANDDISCONNECT_DIR}" != "x"; then
+      if test -d ${PRI_INBANDDISCONNECT_DIR}/lib; then
+      	 pbxlibdir="-L${PRI_INBANDDISCONNECT_DIR}/lib"
       else
-      	 pbxlibdir="-L${PRI_INBANDRELEASE_DIR}"
+      	 pbxlibdir="-L${PRI_INBANDDISCONNECT_DIR}"
       fi
    fi
-   pbxfuncname="pri_set_inbandrelease"
+   pbxfuncname="pri_set_inbanddisconnect"
    if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
-      AST_PRI_INBANDRELEASE_FOUND=yes
+      AST_PRI_INBANDDISCONNECT_FOUND=yes
    else
       as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5
@@ -39142,26 +39142,26 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`
 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-  AST_PRI_INBANDRELEASE_FOUND=yes
+  AST_PRI_INBANDDISCONNECT_FOUND=yes
 else
-  AST_PRI_INBANDRELEASE_FOUND=no
+  AST_PRI_INBANDDISCONNECT_FOUND=no
 fi
 
    fi
 
    # now check for the header.
-   if test "${AST_PRI_INBANDRELEASE_FOUND}" = "yes"; then
-      PRI_INBANDRELEASE_LIB="${pbxlibdir} -lpri "
-      # if --with-PRI_INBANDRELEASE=DIR has been specified, use it.
-      if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then
-	 PRI_INBANDRELEASE_INCLUDE="-I${PRI_INBANDRELEASE_DIR}/include"
+   if test "${AST_PRI_INBANDDISCONNECT_FOUND}" = "yes"; then
+      PRI_INBANDDISCONNECT_LIB="${pbxlibdir} -lpri "
+      # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it.
+      if test "x${PRI_INBANDDISCONNECT_DIR}" != "x"; then
+	 PRI_INBANDDISCONNECT_INCLUDE="-I${PRI_INBANDDISCONNECT_DIR}/include"
       fi
-      PRI_INBANDRELEASE_INCLUDE="${PRI_INBANDRELEASE_INCLUDE} "
+      PRI_INBANDDISCONNECT_INCLUDE="${PRI_INBANDDISCONNECT_INCLUDE} "
       if test "xlibpri.h" = "x" ; then	# no header, assume found
-         PRI_INBANDRELEASE_HEADER_FOUND="1"
+         PRI_INBANDDISCONNECT_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${PRI_INBANDRELEASE_INCLUDE}"
+         CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}"
 	 if test "${ac_cv_header_libpri_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libpri.h" >&5
 echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
@@ -39293,31 +39293,31 @@ echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; }
 
 fi
 if test $ac_cv_header_libpri_h = yes; then
-  PRI_INBANDRELEASE_HEADER_FOUND=1
+  PRI_INBANDDISCONNECT_HEADER_FOUND=1
 else
-  PRI_INBANDRELEASE_HEADER_FOUND=0
+  PRI_INBANDDISCONNECT_HEADER_FOUND=0
 fi
 
 
          CPPFLAGS="${saved_cppflags}"
       fi
-      if test "x${PRI_INBANDRELEASE_HEADER_FOUND}" = "x0" ; then
-         PRI_INBANDRELEASE_LIB=""
-         PRI_INBANDRELEASE_INCLUDE=""
+      if test "x${PRI_INBANDDISCONNECT_HEADER_FOUND}" = "x0" ; then
+         PRI_INBANDDISCONNECT_LIB=""
+         PRI_INBANDDISCONNECT_INCLUDE=""
       else
          if test "x${pbxfuncname}" = "x" ; then		# only checking headers -> no library
-	    PRI_INBANDRELEASE_LIB=""
+	    PRI_INBANDDISCONNECT_LIB=""
 	 fi
-         PBX_PRI_INBANDRELEASE=1
+         PBX_PRI_INBANDDISCONNECT=1
          # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_PRI_INBANDRELEASE 1
+#define HAVE_PRI_INBANDDISCONNECT 1
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_PRI_INBANDRELEASE_VERSION
+#define HAVE_PRI_INBANDDISCONNECT_VERSION
 _ACEOF
 
       fi