[svn-commits] branch oej/securertp-trunk r36287 - in /team/oej/securertp-trunk: ./ configure

[svn-commits at lists.digium.com]

Author: oej
Date: Thu Jun 29 05:57:34 2006
New Revision: 36287

URL: http://svn.digium.com/view/asterisk?rev=36287&view=rev
Log:
Reset automerge

Modified:
    team/oej/securertp-trunk/   (props changed)
    team/oej/securertp-trunk/configure

Propchange: team/oej/securertp-trunk/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Modified: team/oej/securertp-trunk/configure
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/configure?rev=36287&r1=36286&r2=36287&view=diff
==============================================================================
--- team/oej/securertp-trunk/configure (original)
+++ team/oej/securertp-trunk/configure Thu Jun 29 05:57:34 2006
@@ -785,11 +785,6 @@
 SRTP_LIB
 SRTP_INCLUDE
 PBX_LIBSRTP
-EDITLINE_LIBS
-OSS_LIB
-OSS_INCLUDE
-PBX_LIBOSS
-ZAPTEL_LIB
 ZAPTEL_INCLUDE
 PBX_ZAPTEL
 EDITLINE_LIB
@@ -1429,14 +1424,6 @@
   --with-vpb=PATH         use vpb files in PATH
   --with-z=PATH           use zlib files in PATH
   --with-srtp=PATH        use libSRTP files in PATH
-  --with-ossaudio=PATH    use Open Sound System files in PATH
-  --with-tonezone=PATH    use Zaptel files in PATH
-  --with-gsm=PATH         use libgsm files in PATH, or 'internal'
-  --with-pq=PATH          use PostgreSQL files in PATH
-  --with-vpb=PATH         use vpb files in PATH
-  --with-qt=PATH          use Qt files in PATH
-  --with-kde=PATH         use KDE files in PATH
-  --with-pwlib=PATH       use PWLib files in PATH
   --with-zaptel=PATH      use Zaptel files in PATH
 
 Some influential environment variables:
@@ -17789,7 +17776,7 @@
    fi
 fi
 
-
+fi
 
 
 
@@ -18259,25 +18246,6 @@
       exit 1
    fi
 fi
-
-
-
-
-
-EDITLINE_LIBS=""
-if test "x$TERMCAP_LIB" != "x" ; then
-  EDITLINE_LIBS="$TERMCAP_LIB"
-elif test "x$TINFO_LIB" != "x" ; then
-  EDITLINE_LIBS="$TINFO_LIB"
-elif test "x$CURSES_LIB" != "x" ; then
-  EDITLINE_LIBS="$CURSES_LIB"
-elif test "x$NCURSES_LIB" != "x" ; then
-  EDITLINE_LIBS="$NCURSES_LIB"
-else
-  echo "*** termcap support not found"
-  exit 1
-fi
-
 
 
 # Check whether --with-vorbis was given.
@@ -28234,10 +28202,6 @@
 SRTP_LIB!$SRTP_LIB$ac_delim
 SRTP_INCLUDE!$SRTP_INCLUDE$ac_delim
 PBX_LIBSRTP!$PBX_LIBSRTP$ac_delim
-EDITLINE_LIBS!$EDITLINE_LIBS$ac_delim
-OSS_LIB!$OSS_LIB$ac_delim
-OSS_INCLUDE!$OSS_INCLUDE$ac_delim
-PBX_LIBOSS!$PBX_LIBOSS$ac_delim
 ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
 PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 EDITLINE_LIB!$EDITLINE_LIB$ac_delim
@@ -28329,6 +28293,8 @@
 ' >>$CONFIG_STATUS <conf$$subs.sed
 rm -f conf$$subs.sed
 cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
 CEOF$ac_eof
 _ACEOF