moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 03:55:03 -05:00
Code Issues Releases Wiki Activity

In spite claiming to tbe disabled by default, RTSP is enabled and it now

Browse Source 
also says so. I also made the list of protocols get sorted.
This commit is contained in:
Daniel Stenberg 2010-01-22 12:52:35 +00:00
parent e45eefcb90
commit c047fe8e90
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure.ac
View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -427,16 +427,17 @@ AC_HELP_STRING([--disable-rtsp],[Disable RTSP support]),
AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP]) AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
AC_SUBST(CURL_DISABLE_RTSP, [1]) AC_SUBST(CURL_DISABLE_RTSP, [1])
;; ;;
*) if test x$CURL_DISABLE_HTTP = x1 ; then *) if test x$CURL_DISABLE_HTTP = x1 ; then
AC_MSG_ERROR(HTTP support needs to be enabled in order to enable RTSP support!) AC_MSG_ERROR(HTTP support needs to be enabled in order to enable RTSP support!)
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
curl_rtsp_msg="enabled" curl_rtsp_msg="enabled"
fi fi
;; ;;
esac ], esac
AC_MSG_RESULT(no) ],
curl_rtsp_msg="disabled" AC_MSG_RESULT(yes)
curl_rtsp_msg="enabled"
) )
AC_MSG_CHECKING([whether to support proxies]) AC_MSG_CHECKING([whether to support proxies])
@ -2606,6 +2607,11 @@ if test "x$CURL_DISABLE_RTSP" != "x1"; then
SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS RTSP" SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS RTSP"
fi fi
dnl replace spaces with newlines
dnl sort the lines
dnl replace the newlines back to spaces
SUPPORT_PROTOCOLS=`echo $SUPPORT_PROTOCOLS | tr ' ' '\012' | sort | tr '\012' ' '`
AC_SUBST(SUPPORT_PROTOCOLS) AC_SUBST(SUPPORT_PROTOCOLS)
dnl squeeze whitespace out of some variables dnl squeeze whitespace out of some variables