[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1793-g3f3d8e4

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  3f3d8e42454c947c939de787c199350dafd036de (commit)
      from  f246e38aa4723afe397b23f52b489391a17419b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=3f3d8e42454c947c939de787c199350dafd036de


commit 3f3d8e42454c947c939de787c199350dafd036de
Author: Gabriele Giacone <address@hidden>
Date:   Wed Sep 18 20:05:25 2013 +0200

    Enable red5 tests only if curl supports RTMP.

diff --git a/configure.ac b/configure.ac
index 2d9b3b0..a599256 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
@@ -2371,10 +2373,13 @@ if test x$cross_compiling = xno; then
              no) RED5_HOST="" ;;
             yes) RED5_HOST="www.gnashdev.org" ;;
               *) RED5_HOST="${enableval}";;
-           esac])
+           esac
+               if test x"$RED5_HOST" != x -a x"$curl_rtmp_support" != x; then
+                 RED5_TESTING=yes
+             fi])
   AC_SUBST(RED5_HOST)
 fi
-AM_CONDITIONAL(ENABLE_RED5_TESTING, [ test x"$RED5_HOST" != x ])
+AM_CONDITIONAL(ENABLE_RED5_TESTING, [ test x"$RED5_TESTING" != x ])
 
 if test x$cross_compiling = xno; then
   AC_ARG_ENABLE([rtmpy_testing],
@@ -2677,8 +2682,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 +3704,11 @@ 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_REC([CURL library present but built without RTMP protocol support.])
+    PKG_SUGGEST([If you install it with RTMP protocol support, Gnash will be 
able to play RTMP streaming.])
+  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 +3917,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_TESTING" != 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)

-----------------------------------------------------------------------

Summary of changes:
 configure.ac   |   19 +++++++++++++------
 macros/curl.m4 |    5 +++++
 2 files changed, 18 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash