diff --git a/configure.ac b/configure.ac index 2d9b3b0..e23da54 100644 --- a/configure.ac +++ b/configure.ac @@ -2374,7 +2374,7 @@ if test x$cross_compiling = xno; then esac]) AC_SUBST(RED5_HOST) fi -AM_CONDITIONAL(ENABLE_RED5_TESTING, [ test x"$RED5_HOST" != x ]) +AM_CONDITIONAL(ENABLE_RED5_TESTING, [ test x"$RED5_HOST" != x -a -n "$CURL_RTMP" ]) if test x$cross_compiling = xno; then AC_ARG_ENABLE([rtmpy_testing], @@ -3702,6 +3702,9 @@ if test x"$CURL_LIBS" != x; then echo " CURL flags are: default include path" fi echo " CURL libs are: $CURL_LIBS" + if test ! -n "$CURL_RTMP"; then + PKG_WAR([CURL library present but built without RTMP support. Gnash will not be able to play RTMP streaming. Red5 tests disabled.]) + fi else PKG_REC([If you install the CURL library, Gnash will be able to display remote content (streaming from URLs) using CURL.]) PKG_SUGGEST([Install libcurl from http://curl.haxx.se/libcurl]) diff --git a/macros/curl.m4 b/macros/curl.m4 index b0ad815..be3a604 100644 --- a/macros/curl.m4 +++ b/macros/curl.m4 @@ -136,6 +136,12 @@ AC_DEFUN([GNASH_PATH_CURL], AC_DEFINE(USE_CURL, [1], [Define this if you want to enable curl usage]) fi + if test x"${curlconfig}" != "x"; then + if test x"`${curlconfig} --protocols|grep RTMP`" != x; then + AC_DEFINE(CURL_RTMP, [1], [Define this if curl supports RTMP protocol]) + fi + fi + AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) ])