[Gnash-commit] gnash ChangeLog macros/curl.m4 server/StreamPro...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/11 21:48:43

Modified files:
        .              : ChangeLog 
        macros         : curl.m4 
        server         : StreamProvider.cpp 

Log message:
                * macros/curl.m4: define USE_CURL if curl libs are found
                * server/StreamProvider.cpp: rely on USE_CURL from config.h
                  so we're sure we won't end up with undefined references.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1153&r2=1.1154
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1153
retrieving revision 1.1154
diff -u -b -r1.1153 -r1.1154
--- ChangeLog   11 Oct 2006 21:30:21 -0000      1.1153
+++ ChangeLog   11 Oct 2006 21:48:42 -0000      1.1154
@@ -1,5 +1,8 @@
 2006-10-12 Sandro Santilli <address@hidden>
 
+       * macros/curl.m4: define USE_CURL if curl libs are found
+       * server/StreamProvider.cpp: rely on USE_CURL from config.h
+         so we're sure we won't end up with undefined references.
        * plugin/plugin.cpp: raise maxargc to 16, split -r3
          into two arguments (-r) and (3).
 

Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/curl.m4      10 Oct 2006 21:06:28 -0000      1.6
+++ macros/curl.m4      11 Oct 2006 21:48:43 -0000      1.7
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: curl.m4,v 1.6 2006/10/10 21:06:28 nihilus Exp $
+dnl $Id: curl.m4,v 1.7 2006/10/11 21:48:43 strk Exp $
 
 AC_DEFUN([GNASH_PATH_CURL],
 [
@@ -181,6 +181,10 @@
 
   AM_CONDITIONAL(CURL, [test -n "$CURL_LIBS"])
 
+  if test -n "$CURL_LIBS"; then
+    AC_DEFINE(USE_CURL, [1], [Define this if you want to enable curl usage])
+  fi
+
   AC_SUBST(CURL_CFLAGS)
   AC_SUBST(CURL_LIBS)
 ])

Index: server/StreamProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/StreamProvider.cpp   28 Aug 2006 18:47:01 -0000      1.10
+++ server/StreamProvider.cpp   11 Oct 2006 21:48:43 -0000      1.11
@@ -40,9 +40,9 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_CURL_CURL_H
-#define USE_CURL 1
-#endif
+//#ifdef HAVE_CURL_CURL_H
+//#define USE_CURL 1
+//#endif
 
 #include "StreamProvider.h"
 #include "URL.h"