diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2010-01-22 12:52:35 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-01-22 12:52:35 +0000 |
| commit | c047fe8e9016b5b3a586c28d5094ff8bdb40bc9e (patch) | |
| tree | 40d62e2f95a83987984461c985ee1dda2c2d7003 | |
| parent | e45eefcb903b040c2b3705abcc52676332a14e19 (diff) | |
In spite claiming to tbe disabled by default, RTSP is enabled and it now
also says so. I also made the list of protocols get sorted.
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index d240ddb55..f0301b751 100644 --- a/configure.ac +++ b/configure.ac @@ -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 # 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_SUBST(CURL_DISABLE_RTSP, [1]) ;; - *) if test x$CURL_DISABLE_HTTP = x1 ; then - AC_MSG_ERROR(HTTP support needs to be enabled in order to enable RTSP support!) - else - AC_MSG_RESULT(yes) - curl_rtsp_msg="enabled" - fi + *) if test x$CURL_DISABLE_HTTP = x1 ; then + AC_MSG_ERROR(HTTP support needs to be enabled in order to enable RTSP support!) + else + AC_MSG_RESULT(yes) + curl_rtsp_msg="enabled" + fi ;; - esac ], - AC_MSG_RESULT(no) - curl_rtsp_msg="disabled" + esac + ], + AC_MSG_RESULT(yes) + curl_rtsp_msg="enabled" ) AC_MSG_CHECKING([whether to support proxies]) @@ -2606,6 +2607,11 @@ if test "x$CURL_DISABLE_RTSP" != "x1"; then SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS RTSP" 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) dnl squeeze whitespace out of some variables |