VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm])
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd],[-lws2_32])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi],[-lws2_32])
+ VLC_ADD_LIBS([access_file], [-lshlwapi])
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
-AC_CHECK_HEADERS([linux/version.h linux/dccp.h])
+AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h])
AC_CHECK_HEADERS(syslog.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
VLC_ADD_PLUGIN([deinterlace])
VLC_ADD_PLUGIN([yuvp])
VLC_ADD_PLUGIN([invert])
+VLC_ADD_PLUGIN([mirror])
VLC_ADD_PLUGIN([adjust])
VLC_ADD_PLUGIN([transform])
VLC_ADD_PLUGIN([wave])
])
AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
-AC_ARG_ENABLE(switcher,
- [ --enable-switcher Stream-out switcher plugin (default disabled)])
-
dnl Check for libshout
AC_ARG_ENABLE(shout,
[ --enable-shout libshout output plugin (default disabled)])
VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
VLC_RESTORE_FLAGS
+ have_avcodec="yes"
],[
AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
])
fi
+dnl
+dnl stream_out switcher needs libavcodec
+dnl
+AC_ARG_ENABLE(switcher,
+ [ --enable-switcher Stream-out switcher plugin (default disabled)])
+AS_IF([test "${enable_switcher}" = "yes"], [
+ AS_IF([test "x${have_avcodec}" = "xyes"], [
+ VLC_ADD_PLUGIN([stream_out_switcher])
+ VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS])
+ VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS])
+ ],[AC_MSG_ERROR([Stream_out switcher depends on avcodec])
+ ])
+])
+
+
dnl
dnl avformat demuxer/muxer plugin
dnl
dnl
AC_ARG_ENABLE(zvbi,
AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with
- libzvbi (default enabled)]))
+ libzvbi (default enabled)]))
AC_ARG_ENABLE(telx,
AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with
- zvbi) (default enabled if zvbi is absent)]))
+ zvbi) (default enabled if zvbi is absent)]))
AS_IF( [test "${enable_zvbi}" != "no"],[
PKG_CHECK_MODULES(ZVBI,
- zvbi-0.2 >= 0.2.25,
- [
- VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
- VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
+ zvbi-0.2 >= 0.2.25,
+ [
+ VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
+ if test "${SYS}" = "mingw32"; then
+ VLC_ADD_LIBS([zvbi],[ -lpthreadGC2])
+ fi
+ VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_PLUGIN([zvbi])
- AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
- AS_IF( [test "${enable_telx}" = "yes"],[
- AC_MSG_WARN([The zvbi and telx modules are uncompatibles.
- Using zvbi.])
- ])
- ],[
- AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
- ])
+ AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
+ AS_IF( [test "${enable_telx}" = "yes"],[
+ AC_MSG_WARN([The zvbi and telx modules are uncompatibles.
+ Using zvbi.])
+ ])
+ ],[
+ AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
+ ])
])
AS_IF( [test "${enable_telx}" != "no" ],[
VLC_ADD_PLUGIN([telx])
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
[VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
if test "${SYS}" = "mingw32"; then
- VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz -lxml2])
+ VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz])
else
VLC_ADD_LIBS([libass],[-lfontconfig])
fi
[
VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS])
VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS])
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC])
+ if test "${SYS}" = "mingw32"; then
+ VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC])
fi
VLC_ADD_PLUGIN([asademux])
],[
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${SYS}" = "mingw32"; then
- VLC_ADD_LIBS([freetype skins2],[-lxml2])
+ VLC_ADD_LIBS([skins2],[-lxml2])
VLC_ADD_LIBS([freetype],[-liconv])
fi
if test "${enable_fontconfig}" != "no"
if test -z "${with_directx}"
then
AC_CHECK_HEADERS(ddraw.h,
- [ VLC_ADD_PLUGIN([vout_directx])
+ [ VLC_ADD_PLUGIN([directx])
VLC_ADD_PLUGIN([aout_directx])
- VLC_ADD_LIBS([vout_directx],[-lgdi32])
+ VLC_ADD_LIBS([directx],[-lgdi32])
])
AC_CHECK_HEADERS(GL/gl.h,
[ VLC_ADD_PLUGIN([glwin32])
AC_MSG_CHECKING(for directX headers in ${with_directx})
if test -f ${with_directx}/ddraw.h
then
- VLC_ADD_PLUGIN([vout_directx])
+ VLC_ADD_PLUGIN([directx])
VLC_ADD_PLUGIN([aout_directx])
- VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}])
- VLC_ADD_LIBS([vout_directx],[-lgdi32])
+ VLC_ADD_CPPFLAGS([directx aout_directx],[-I${with_directx}])
+ VLC_ADD_LIBS([directx],[-lgdi32])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
], [
- VLC_ADD_LIBS([qt4],[$QT4_LIBS])
+ VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
])
QT4LOCALEDIR="$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
AC_SUBST(QT4LOCALEDIR)
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
+ VLC_ADD_LDFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle -Wl,-framework,Sparkle])
+ VLC_ADD_OBJCFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle])
dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
VLC_ADD_LDFLAGS([macosx qtcapture], [-Wl,-framework,QTKit])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
- VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
+ VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] )
VLC_ADD_PLUGIN([access_eyetv])
VLC_ADD_PLUGIN([qtcapture])
VLC_ADD_PLUGIN([macosx])
VLC_ADD_PLUGIN([minimal_macosx])
-
- ORIGCFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -x objective-c"
- AC_TRY_COMPILE([#import <QuartzCore/CALayer.h>],,
- [VLC_ADD_PLUGIN([opengllayer])
- VLC_ADD_OBJCFLAGS([opengllayer])],[])
- CFLAGS=$ORIGCFLAGS
+ VLC_ADD_PLUGIN([opengllayer])
fi
dnl
if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then
AC_ARG_ENABLE(atmo,
AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight)
- (default enabled)]))
+ (default enabled)]))
if test "${enable_atmo}" != "no"; then
AC_LANG_PUSH(C++)
VLC_ADD_PLUGIN([atmo])
projects / vlc / blobdiff