]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
In spite claiming to tbe disabled by default, RTSP is enabled and it now
authorDaniel Stenberg <daniel@haxx.se>
Fri, 22 Jan 2010 12:52:35 +0000 (12:52 +0000)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 22 Jan 2010 12:52:35 +0000 (12:52 +0000)
also says so. I also made the list of protocols get sorted.

configure.ac

index d240ddb557e3144e6ca73949f30af7822d435c9a..f0301b751118ddfafc89c105ff548c0e22e53b34 100644 (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
 # 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