[xiph-cvs] cvs commit: vorbis-tools/ogg123 http_transport.c transport.c

[Segher Boessenkool]

segher      02/05/04 20:45:04

  Modified:    ogg123   http_transport.c transport.c
  Log:
  Allow compiling vorbis-tools without libcurl, by specifying
  --without-curl

Revision  Changes    Path
1.9       +5 -1      vorbis-tools/ogg123/http_transport.c

Index: http_transport.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/http_transport.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_transport.c	2002/01/26 11:06:37	1.8
+++ http_transport.c	2002/05/05 03:45:04	1.9
@@ -11,10 +11,12 @@
  *                                                                  *
  ********************************************************************
  
- last mod: $Id: http_transport.c,v 1.8 2002/01/26 11:06:37 segher Exp $
+ last mod: $Id: http_transport.c,v 1.9 2002/05/05 03:45:04 segher Exp $
  
 ********************************************************************/
 
+#ifdef HAVE_CURL
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -329,3 +331,5 @@
   &http_tell,
   &http_close
 };
+
+#endif /* HAVE_CURL */

<p><p>1.4       +10 -2     vorbis-tools/ogg123/transport.c

Index: transport.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/transport.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- transport.c	2002/01/26 11:06:38	1.3
+++ transport.c	2002/05/05 03:45:04	1.4
@@ -11,7 +11,7 @@
  *                                                                  *
  ********************************************************************
 
- last mod: $Id: transport.c,v 1.3 2002/01/26 11:06:38 segher Exp $
+ last mod: $Id: transport.c,v 1.4 2002/05/05 03:45:04 segher Exp $
 
  ********************************************************************/
 
@@ -22,9 +22,17 @@
 #include "i18n.h"
 
 extern transport_t file_transport;
+#ifdef HAVE_CURL
 extern transport_t http_transport;
+#endif
 
-transport_t *transports[] = { &http_transport, &file_transport, NULL };
+transport_t *transports[] = {
+#ifdef HAVE_CURL
+  &http_transport,
+#endif
+  &file_transport,
+  NULL
+};
 
 
 transport_t *get_transport_by_name (char *name)

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.