mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Fix check so that future libneon API changes won't break the build.

Browse source 
Original commit message from CVS:
* configure.ac:
Fix check so that future libneon API changes won't break the build.
* ext/neon/gstneonhttpsrc.c:
Fix build with libneon-0.26.x (#345182).
This commit is contained in:
Tim-Philipp Müller 2006-06-19 14:07:24 +00:00
parent 4e48509c4d
commit 85db24636a
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-06-19 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
Fix check so that future libneon API changes won't break the build.
* ext/neon/gstneonhttpsrc.c:
Fix build with libneon-0.26.x (#345182).
2006-06-17 Tim-Philipp Müller <tim at centricular dot net> 2006-06-17 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac: * configure.ac:

2
configure.ac
View file

@ -564,7 +564,7 @@ GST_CHECK_FEATURE(MUSICBRAINZ, [musicbrainz tag generation], musicbrainz, [
dnl *** neon *** dnl *** neon ***
translit(dnm, m, l) AM_CONDITIONAL(USE_NEON, true) translit(dnm, m, l) AM_CONDITIONAL(USE_NEON, true)
GST_CHECK_FEATURE(NEON, [neon http client plugins], neonhttpsrc, [ GST_CHECK_FEATURE(NEON, [neon http client plugins], neonhttpsrc, [
PKG_CHECK_MODULES(NEON, neon >= 0.25.5, HAVE_NEON="yes", [ PKG_CHECK_MODULES(NEON, neon >= 0.25.5 neon <= 0.26.99, HAVE_NEON="yes", [
HAVE_NEON="no" HAVE_NEON="no"
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
]) ])

13
ext/neon/gstneonhttpsrc.c
View file

@ -20,6 +20,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#ifndef NE_FREE
#define NEON_026_OR_LATER 1
#endif
#define HTTP_DEFAULT_HOST "localhost" #define HTTP_DEFAULT_HOST "localhost"
#define HTTP_DEFAULT_PORT 80 #define HTTP_DEFAULT_PORT 80
#define HTTPS_DEFAULT_PORT 443 #define HTTPS_DEFAULT_PORT 443
@ -626,10 +630,13 @@ set_proxy (const char *uri, ne_uri * parsed, gboolean set_default)
if (parsed->host && !parsed->port) { if (parsed->host && !parsed->port) {
goto clear; goto clear;
} }
#ifdef NEON_026_OR_LATER
if (!parsed->path || parsed->authinfo) { if (!parsed->path || parsed->userinfo)
goto clear; goto clear;
} #else
if (!parsed->path || parsed->authinfo)
goto clear;
#endif
return TRUE; return TRUE;