dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.87 2003/10/07 21:13:01 sam Exp $
+dnl $Id: configure.ac,v 1.88 2003/10/21 01:05:32 titer Exp $
AC_INIT(vlc,0.6.3-cvs)
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
AX_ADD_LDFLAGS([vlc beos],[-lbe])
AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
+ AX_ADD_LDFLAGS([mkv],[-lstdc++.r4])
dnl Check for BONE presence
AC_CHECK_LIB(socket, connect,
if test "${enable_mkv}" != "no"
then
AC_LANG_PUSH(C++)
- dnl matroska headers include ebml headers directly... pouah that stinks
- CPPFLAGS="${CPPFLAGS_save} -I/usr/local/include/ebml -I/usr/include/ebml"
- AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
+ AC_CHECK_HEADERS(ebml/EbmlVersion.h matroska/KaxVersion.h, [
AC_CHECK_HEADERS(matroska/KaxAttachments.h)
AX_ADD_PLUGINS([mkv])
- AX_ADD_CXXFLAGS([mkv],[-I/usr/local/include/ebml -I/usr/include/ebml])
AC_CHECK_LIB(ebml_pic,main,[
# We have ebml_pic, that's good, we can build an mkv.so plugin !
AX_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
* http.c : http mini-server ;)
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: http.c,v 1.23 2003/10/17 18:59:00 zorglub Exp $
+ * $Id: http.c,v 1.24 2003/10/21 01:05:32 titer Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr>
#define PRINTS( str, s ) \
ALLOC( strlen( str ) + strlen( s ) + 1 ); \
- char * psz_cur = *pp_dst; \
- *pp_dst += sprintf( *pp_dst, str, s ); \
- while( psz_cur && *psz_cur ) \
- { \
- /* Prevent script injection */ \
- if( *psz_cur == '<' ) *psz_cur = '*'; \
- if( *psz_cur == '>' ) *psz_cur = '*'; \
- psz_cur++ ; \
+ { \
+ char * psz_cur = *pp_dst; \
+ *pp_dst += sprintf( *pp_dst, str, s ); \
+ while( psz_cur && *psz_cur ) \
+ { \
+ /* Prevent script injection */ \
+ if( *psz_cur == '<' ) *psz_cur = '*'; \
+ if( *psz_cur == '>' ) *psz_cur = '*'; \
+ psz_cur++ ; \
+ } \
}
switch( StrToMacroType( m->id ) )