diff --git a/configure.ac b/configure.ac index 2d9b3b0..6046114 100644 --- a/configure.ac +++ b/configure.ac @@ -2303,6 +2303,8 @@ dnl Find freetype and fontconfig GNASH_PATH_FREETYPE2 GNASH_PKG_FIND(fontconfig, [fontconfig/fontconfig.h], [fontconfig library], FcFontMatch) +GNASH_PATH_CURL + if test x$cross_compiling = xno; then AC_PATH_MING fi @@ -2374,7 +2376,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 x"${curl_rtmp_support}" != x ]) if test x$cross_compiling = xno; then AC_ARG_ENABLE([rtmpy_testing], @@ -2677,8 +2679,6 @@ AM_CONDITIONAL(ENABLE_XMLTEX, [ test x"$PDFXMLTEX" != x -a x"$XSLTPROC" != x -a AM_CONDITIONAL(ENABLE_MAN, [ test x"$DB2X_MAN" != x -o x"$DB2X_MANXML" != x ]) AM_CONDITIONAL(HAVE_AGG, [test x"${AGG_LIBS}" != x]) -GNASH_PATH_CURL - dnl Define winsock if we're on windows. We could do something complicated, dnl but since AC_EXEEXT does it for us, we'll do this the easy way. if test x"$EXEEXT" = "exe"; then @@ -3701,7 +3701,10 @@ if test x"$CURL_LIBS" != x; then else echo " CURL flags are: default include path" fi - echo " CURL libs are: $CURL_LIBS" + echo " CURL libs are: $CURL_LIBS" + if test -z "$curl_rtmp_support"; 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]) @@ -3910,7 +3913,7 @@ if test x"$testsuite" = x"yes"; then echo " HTTP testsuite dir is $HTTP_TESTSUITE" fi - if test x"$RED5_HOST" != x; then + if test x"$RED5_HOST" != x -a x"${curl_rtmp_support}" != x; then echo " RED5 testing host is $RED5_HOST" fi fi diff --git a/macros/curl.m4 b/macros/curl.m4 index b0ad815..a1aaed3 100644 --- a/macros/curl.m4 +++ b/macros/curl.m4 @@ -134,6 +134,11 @@ AC_DEFUN([GNASH_PATH_CURL], if test -n "$CURL_LIBS"; then AC_DEFINE(USE_CURL, [1], [Define this if you want to enable curl usage]) + if test x"${curlconfig}" != "x"; then + if test x"`${curlconfig} --protocols|grep RTMP`" != x; then + curl_rtmp_support=yes + fi + fi fi AC_SUBST(CURL_CFLAGS)