[Alsaplayer-devel]PATCH; improved curl configure test

Daniel Resare noa@metamatrix.se
29 Jul 2002 17:08:19 +0200


--=-mxvksBvG2ZIeJKvUzw4C
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

It seems like some versions of curl is broken so that alsaplayer-0.99.71
doesn't compile. (notably the ones distributed with redhat linux)

I attach a patch to the configure.am that checks for the brokenness and
disables curl support when found.

Please cc any replies to me as I'm not on the alsaplayer-devel list.

cheers
/noa



--=-mxvksBvG2ZIeJKvUzw4C
Content-Disposition: attachment; filename=alsaplayer-0.99.71-curlcheck.patch
Content-Transfer-Encoding: quoted-printable
Content-Type: text/x-patch; name=alsaplayer-0.99.71-curlcheck.patch;
	charset=ISO-8859-15

diff -ur alsaplayer-0.99.71.vanilla/configure.ac alsaplayer-0.99.71/configu=
re.ac
--- alsaplayer-0.99.71.vanilla/configure.ac	Mon Jun 24 18:14:17 2002
+++ alsaplayer-0.99.71/configure.ac	Mon Jul 29 16:48:56 2002
@@ -293,9 +293,18 @@
     CURL_CFLAGS=3D`$curlconfig --cflags`
     CURL_LIBS=3D`$curlconfig --libs`
=20
-    AC_SUBST(CURL_CFLAGS)
-    AC_SUBST(CURL_LIBS)
-    have_curl=3Dyes
+    dnl Some versions of curl (notably curl-7.9.5 distributed in redhat-7.=
3)
+    dnl doesn't define CURLM.
+    CFLAGS_save=3D$CFLAGS
+    CFLAGS=3D"$CFLAGS $CURL_CFLAGS"
+    AC_MSG_CHECKING(if curl headers defines CURLM)
+    AC_EGREP_HEADER("CURLM", curl/curl.h, have_curl=3Dyes, AC_MSG_RESULT(n=
o))
+    if test "x$have_curl" =3D "xyes"; then
+	AC_MSG_RESULT(yes)
+        AC_SUBST(CURL_LIBS)
+        AC_SUBST(CURL_CFLAGS)
+    fi
+    CFLAGS=3D$CFLAGS_save
 fi
=20
 dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

--=-mxvksBvG2ZIeJKvUzw4C--