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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/09/03 00:52:46

Modified files:
        macros         : curl.m4 
        .              : ChangeLog 

Log message:
                * configure.ac: Check to see if libCurl supports RTMP.
                * macros/curl.m4: Add support to use curl-config. Look to see 
what
                protocols it supports.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.808&r2=1.809

Patches:
Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/curl.m4      9 Aug 2006 01:59:07 -0000       1.2
+++ macros/curl.m4      3 Sep 2006 00:52:46 -0000       1.3
@@ -38,7 +38,7 @@
 AC_DEFUN([GNASH_PATH_CURL],
 [
   dnl Look for the header
-  AC_ARG_WITH(curl_incl, [  --with-curl_incl         directory where libcurl 
header is (w/out the curl/ prefix)], with_curl_incl=${withval})
+  AC_ARG_WITH(curl_incl, [  --with-curl-incl         directory where libcurl 
header is (w/out the curl/ prefix)], with_curl_incl=${withval})
     AC_CACHE_VAL(ac_cv_path_curl_incl,[
     if test x"${with_curl_incl}" != x ; then
       if test -f ${with_curl_incl}/curl/curl.h ; then
@@ -49,8 +49,25 @@
     fi
   ])
 
+  AC_CHECK_PROG(curlconfig, [echo], [curl-config])
+  if test x"${curlconfig}" != "x" ; then
+    AC_MSG_CHECKING([for RTMP support])
+    rtmp=`${curlconfig} --protocols|grep -c RTMP`
+    if test $rtmp -eq 0; then
+       AC_MSG_RESULT([none])
+       rtmp=no
+    else
+       AC_MSG_RESULT([yes])
+       rtmp=yes
+    fi
+  fi
+
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_curl_incl}" = x; then
+    if test x"${curlconfig}" != "x" ; then
+      ac_cv_path_curl_incl=`${curlconfig} --cflags`
+    else
+      if test x"${ac_cv_path_curl_incl}" = x ; then
     AC_CHECK_HEADERS(curl/curl.h, [ac_cv_path_curl_incl=""],[
       if test x"${ac_cv_path_curl_incl}" = x; then
         AC_MSG_CHECKING([for libcurl header])
@@ -58,11 +75,12 @@
 
         for i in $incllist; do
    if test -f $i/curl/curl.h; then
-     ac_cv_path_curl_incl="$i"
+              ac_cv_path_curl_incl="-I$i"
    fi
         done
+        fi])
+      fi
       fi
-    ])
   fi
 
   if test x"${ac_cv_path_curl_incl}" != x ; then
@@ -82,7 +100,7 @@
     AC_CACHE_VAL(ac_cv_path_curl_lib,[
     if test x"${with_curl_lib}" != x ; then
       if test -f ${with_curl_lib}/libcurl.a -o -f ${with_curl_lib}/libcurl.so; 
then
- ac_cv_path_curl_lib=`(cd ${with_curl_incl}; pwd)`
+ ac_cv_path_curl_lib="-L`(cd ${with_curl_lib}; pwd)`"
       else
  AC_MSG_ERROR([${with_curl_lib} directory doesn't contain libcurl.])
       fi
@@ -91,6 +109,9 @@
 
   dnl If the header doesn't exist, there is no point looking for the library.
   if test x"${ac_cv_path_curl_lib}" = x; then 
+    if test x"${curlconfig}" != "x" ; then
+      ac_cv_path_curl_lib=`${curlconfig} --libs`
+    else
     AC_CHECK_LIB(curl, curl_global_init, [ac_cv_path_curl_lib="-lcurl"],[
       AC_MSG_CHECKING([for libcurl library])
       libslist="/usr/lib64 /usr/lib /sw/lib /opt/local/lib /usr/local/lib 
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
@@ -108,6 +129,7 @@
  fi
       done
     ])
+    fi
   else 
     if test -f ${ac_cv_path_curl_lib}/libcurl.a -o -f 
${ac_cv_path_curl_lib}/libcurl.so; then 
 
@@ -120,7 +142,7 @@
   fi 
 
   if test x"${ac_cv_path_curl_incl}" != x ; then
-    CURL_CFLAGS="-I${ac_cv_path_curl_incl}"
+    CURL_CFLAGS="${ac_cv_path_curl_incl}"
   else
     CURL_CFLAGS=""
   fi

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -b -r1.808 -r1.809
--- ChangeLog   2 Sep 2006 16:00:29 -0000       1.808
+++ ChangeLog   3 Sep 2006 00:52:46 -0000       1.809
@@ -1,3 +1,9 @@
+2006-09-02  Rob Savoye  <address@hidden>
+
+       * configure.ac: Check to see if libCurl supports RTMP.
+       * macros/curl.m4: Add support to use curl-config. Look to see what
+       protocols it supports.
+
 2006-09-02 Sandro Santilli  <address@hidden>
 
        * gui/gnash.cpp, doc/C/gnash.xml: added -P switch to set contextual
@@ -33,8 +39,12 @@
        * libbase/URL.{cpp,h}, testsuite/libbase/URLTest.cpp:
          Added anchor support in URL class (+tests).
 
+>>>>>>> 1.808
 2006-08-31  Rob Savoye  <address@hidden>
 
+       * doc/C/Makefile.am: Add --encoding=us-ascii//TRANSLIT so control
+       characters don't slide in that prevent db2x_texixml from working.
+       
        * gui/images: New directory for images. Patch #5346.
        * gui/images/gnash_128_96.ico: New icon for GTK executable. Patch
        #5346.