aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-25 22:39:35 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-25 22:39:35 +0000
commit32dbf3859ee61950be8a0dd5164bb84969db4611 (patch)
tree5baf2cc4ca9e69c86d905042364d0a856012e18a /configure
parentdd766d1fbd5576088597e1169f6eb4f6adc427a5 (diff)
Removing chan_vpb from the tree
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@100420 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure147
1 files changed, 6 insertions, 141 deletions
diff --git a/configure b/configure
index 26d0b7d9d..197b9a9ae 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 98985 .
+# From configure.ac Revision: 99696 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
#
@@ -905,10 +905,6 @@ VORBIS_LIB
VORBIS_INCLUDE
VORBIS_DIR
PBX_VORBIS
-VPB_LIB
-VPB_INCLUDE
-VPB_DIR
-PBX_VPB
X11_LIB
X11_INCLUDE
X11_DIR
@@ -1624,7 +1620,6 @@ Optional Packages:
--with-tonezone=PATH use tonezone files in PATH
--with-usb=PATH use usb files in PATH
--with-vorbis=PATH use Vorbis files in PATH
- --with-vpb=PATH use Voicetronix API files in PATH
--with-x11=PATH use X11 support files in PATH
--with-z=PATH use zlib files in PATH
--with-zaptel=PATH use Zaptel files in PATH
@@ -9230,34 +9225,6 @@ fi
- VPB_DESCRIP="Voicetronix API"
- VPB_OPTION="vpb"
-
-# Check whether --with-vpb was given.
-if test "${with_vpb+set}" = set; then
- withval=$with_vpb;
- case ${withval} in
- n|no)
- USE_VPB=no
- ;;
- y|ye|yes)
- ac_mandatory_list="${ac_mandatory_list} VPB"
- ;;
- *)
- VPB_DIR="${withval}"
- ac_mandatory_list="${ac_mandatory_list} VPB"
- ;;
- esac
-
-fi
-
- PBX_VPB=0
-
-
-
-
-
-
X11_DESCRIP="X11 support"
X11_OPTION="x11"
@@ -44742,104 +44709,6 @@ _ACEOF
fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-if test "${USE_VPB}" != "no"; then
- { echo "$as_me:$LINENO: checking for vpb_open in -lvpb" >&5
-echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6; }
- saved_libs="${LIBS}"
- saved_cppflags="${CPPFLAGS}"
- if test "x${VPB_DIR}" != "x"; then
- if test -d ${VPB_DIR}/lib; then
- vpblibdir=${VPB_DIR}/lib
- else
- vpblibdir=${VPB_DIR}
- fi
- LIBS="${LIBS} -L${vpblibdir}"
- CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
- fi
- LIBS="${LIBS} -lvpb -lpthread"
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <vpbapi.h>
-int
-main ()
-{
-int q = vpb_open(0,0);
- ;
- return 0;
-}
-
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- ac_cv_lib_vpb_vpb_open="yes"
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- ac_cv_lib_vpb_vpb_open="no"
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="${saved_libs}"
- CPPFLAGS="${saved_cppflags}"
- if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
- VPB_LIB="-lvpb"
- if test "${VPB_DIR}" != ""; then
- VPB_LIB="-L${vpblibdir} ${VPB_LIB}"
- VPB_INCLUDE="-I${VPB_DIR}/include"
- fi
- PBX_VPB=1
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_VPB 1
-_ACEOF
-
- fi
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
if test "x${PBX_ZLIB}" != "x1" -a "${USE_ZLIB}" != "no"; then
pbxlibdir=""
@@ -49879,12 +49748,12 @@ VORBIS_LIB!$VORBIS_LIB$ac_delim
VORBIS_INCLUDE!$VORBIS_INCLUDE$ac_delim
VORBIS_DIR!$VORBIS_DIR$ac_delim
PBX_VORBIS!$PBX_VORBIS$ac_delim
-VPB_LIB!$VPB_LIB$ac_delim
-VPB_INCLUDE!$VPB_INCLUDE$ac_delim
-VPB_DIR!$VPB_DIR$ac_delim
-PBX_VPB!$PBX_VPB$ac_delim
X11_LIB!$X11_LIB$ac_delim
X11_INCLUDE!$X11_INCLUDE$ac_delim
+X11_DIR!$X11_DIR$ac_delim
+PBX_X11!$PBX_X11$ac_delim
+ZLIB_LIB!$ZLIB_LIB$ac_delim
+ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -49926,10 +49795,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-X11_DIR!$X11_DIR$ac_delim
-PBX_X11!$PBX_X11$ac_delim
-ZLIB_LIB!$ZLIB_LIB$ac_delim
-ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
ZLIB_DIR!$ZLIB_DIR$ac_delim
PBX_ZLIB!$PBX_ZLIB$ac_delim
ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim
@@ -49998,7 +49863,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5