AC_SUBST(PKGDIR)
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="Goldeneye"
+CODENAME="Yellow Bastard"
COPYRIGHT_YEARS="1996-2009"
AC_PREREQ(2.59c)
echo " Assuming --disable-skins2"
enable_x11="no"
echo " Assuming --disable-x11"
+ enable_xcb="no"
+ echo " Assuming --disable-xcb"
enable_glx="no"
echo " Assuming --disable-glx"
enable_xvideo="no"
OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
LD="${LD} -syslibroot ${with_macosx_sdk}"
fi
- if test "${host_cpu}" = "powerpc"; then
- CPP="${CPP} -arch ppc"
- CC="${CC} -arch ppc"
- CXX="${CXX} -arch ppc"
- OBJC="${OBJC} -arch ppc"
- LD="${LD} -arch ppc"
- fi
- if test "${host_cpu}" = "i386"; then
- CPP="${CPP} -arch i386"
- CC="${CC} -arch i386"
- CXX="${CXX} -arch i386"
- OBJC="${OBJC} -arch i386"
- LD="${LD} -arch i386"
- fi
AC_ARG_WITH(macosx-version-min,
[ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
if test "${with_macosx_version_min}" != "" ; then
fi
fi
;;
- *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+ *mingw32* | *cygwin* | *wince* | *mingwce*)
AC_CHECK_TOOL(WINDRES, windres, :)
AC_CHECK_TOOL(OBJCOPY, objcopy, :)
case "${host_os}" in
- *wince* | *mingwce* | *mingw32ce* | *pe*)
+ *wince* | *mingwce* | *mingw32ce*)
SYS=mingwce
dnl Sadly CeGCC still needs non-wince macros
AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.])
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
- VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r lrintf daemon fork lstat posix_fadvise posix_madvise uselocale])
AC_FUNC_ALLOCA
AC_CHECK_FUNCS(fcntl)
-AC_REPLACE_FUNCS([asprintf atof atoll gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
AC_CHECK_FUNCS([stricmp strnicmp])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
dnl Check for dynamic plugins
ac_cv_have_plugins=no
-# OS X style
-AC_CHECK_HEADERS(mach-o/dyld.h,
- [AC_CHECK_FUNCS(NSLinkModule,
- [AC_DEFINE(HAVE_DL_DYLD, 1, [Define if you have the Darwin dyld API])
- ac_cv_have_plugins=yes])])
-
# HP-UX style
if test "${ac_cv_have_plugins}" = "no"; then
AC_CHECK_HEADERS(dl.h)
fi
fi
-# Whatever style
-if test "${ac_cv_have_plugins}" = "no"; then
- AC_CHECK_LIB(dld, dld_link,
- [VLC_ADD_LIBS([libvlccore],[-ldld])
- AC_DEFINE(HAVE_DL_DLD_LINK, 1, [Define if you have the GNU dld library])
- ac_cv_have_plugins=yes])
-fi
-
# Win32 style
if test "${ac_cv_have_plugins}" = "no"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
fi
# Only test for dlopen() if the others didn't work
-if test "${ac_cv_have_plugins}" = "no"; then
+if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
ac_cv_my_have_dlopen=no
AC_CHECK_FUNC(dlopen,
AC_MSG_RESULT(no)])
dnl Check for headers
-AC_CHECK_HEADERS(getopt.h strings.h locale.h)
-AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h)
+AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
+AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h sys/mount.h)
AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
AC_CHECK_HEADERS([net/if.h], [], [],
[
])
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])
fi
else
if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then
- CFLAGS_TUNING="-march=pentium-m -mtune=prescott"
+ CFLAGS_TUNING="-march=prescott -mtune=generic"
elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then
CFLAGS_TUNING="-mtune=pentium2"
elif test "${host_cpu}" = "x86_64"; then
])
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)])
[ if test -n "${enable_smb}"; then
AC_MSG_ERROR([cannot find libsmbclient headers])
fi ])
- AC_CHECK_MEMBER([struct _SMBCCTX.close_fn],
- AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], 1, [Define if samba has _SMBCCTX.close_fn]),,
- [#include <libsmbclient.h>])
fi
dnl
[ --enable-mpc Mpc demux support (default enabled)])
if test "${enable_mpc}" != "no"
then
- AC_CHECK_HEADERS(mpcdec/mpcdec.h, [
+ AC_CHECK_HEADERS([mpc/mpcdec.h], [
VLC_ADD_PLUGIN([mpc])
- VLC_ADD_LIBS([mpc],[-lmpcdec])])
+ VLC_ADD_LIBS([mpc],[-lmpcdec])],
+ [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [
+ VLC_ADD_PLUGIN([mpc])
+ VLC_ADD_LIBS([mpc],[-lmpcdec])])])
fi
dnl
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
dnl Speex plugin
dnl
-AC_ARG_ENABLE(speex,
- [ --enable-speex Speex decoder support (default enabled)])
-if test "${enable_speex}" != "no"
-then
- AC_ARG_WITH(speex-tree,
- [ --with-speex-tree=PATH speex tree for static linking])
- if test -n "${with_speex_tree}"
- then
- AC_MSG_CHECKING(for libspeex.a in ${with_speex_tree})
- real_speex_tree="`cd ${with_speex_tree} 2>/dev/null && pwd`"
- if test -z "${real_speex_tree}"
- then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_speex_tree}])
- fi
- if test -f "${real_speex_tree}/libspeex/.libs/libspeex.a"
- then
- dnl Use a custom speex
- AC_MSG_RESULT(${real_speex_tree}/libspeex/.libs/libspeex.a)
- VLC_ADD_PLUGIN([speex])
- VLC_ADD_LIBS([speex],[${real_speex_tree}/libspeex/.libs/libspeex.a])
- VLC_ADD_CFLAGS([speex],[-I${real_speex_tree}/include])
- else
- dnl The given speex wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_speex_tree}/libspeex/.libs/libspeex.a, make sure you compiled speex in ${with_speex_tree}])
- fi
- else
- AC_CHECK_HEADERS(speex/speex.h, [
- LDFLAGS="${LDFLAGS_save} ${LIBS_speex}"
- AC_CHECK_LIB(speex, speex_decode_int, [
- VLC_ADD_PLUGIN([speex])
- VLC_ADD_LIBS([speex],[-lspeex]) ],
- [ AC_MSG_RESULT([no])
- AC_MSG_WARN([Your libspeex is too old, please get the development
- version.]) ],[])
- LDFLAGS="${LDFLAGS_save}"
- ],[])
- fi
-fi
+PKG_ENABLE_MODULES_VLC([SPEEX], [speex >= 1.0.5], [Speex decoder support], [auto])
dnl
dnl tarkin decoder plugin
dnl
dnl theora decoder plugin
dnl
-AC_ARG_ENABLE(theora,
-[ --enable-theora experimental theora codec (default disabled)])
-if test "${enable_theora}" = "yes"
-then
- AC_CHECK_HEADERS(theora/theora.h, [
- AC_CHECK_LIB(theora, theora_granule_time, [
- VLC_ADD_PLUGIN([theora])
- theora_libs="-ltheora -logg"
- VLC_ADD_LIBS([theora],[${theora_libs}]) ],[
- AC_MSG_ERROR([libtheora doesn't appear to be installed on your system.
-You also need to check that you have a libogg posterior to the 1.0 release.])],
- [-logg])
- ])
-fi
+PKG_ENABLE_MODULES_VLC([THEORA], [theora >= 1.0], [experimental theora codec], [auto])
dnl
-dnl dirac decoder plugin
+dnl dirac encoder plugin
dnl
-AC_ARG_ENABLE(dirac,
-[ --enable-dirac experimental dirac codec (default disabled)])
-if test "${enable_dirac}" = "yes"; then
- PKG_CHECK_MODULES(DIRAC,[dirac >= 0.10.0], [
- VLC_ADD_PLUGIN([dirac])
- VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
- VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
- AC_MSG_ERROR([libdirac >= 0.10.0 doesn't appear to be installed on your system.])
- ])
-fi
+PKG_ENABLE_MODULES_VLC([DIRAC], [dirac >= 0.10.0], [dirac encoder], [auto], [], [ -lstdc++])
dnl
dnl schroedinger decoder plugin (for dirac format video)
dnl
-AC_ARG_ENABLE(schroedinger,
-[ --disable-schroedinger high performance dirac codec (default enabled)])
-if test "${enable_schroedinger}" != "no"; then
- PKG_CHECK_MODULES(SCHROEDINGER,[schroedinger-1.0 >= 1.0.6], [
- VLC_ADD_PLUGIN([schroedinger])
- VLC_ADD_CFLAGS([schroedinger],[$SCHROEDINGER_CFLAGS])
- VLC_ADD_LIBS([schroedinger],[$SCHROEDINGER_LIBS]) ], [
- AS_IF([test "x${enable_schroedinger}" != "x"], [
- AC_MSG_ERROR([${SCHROEDINGER_PKG_ERRORS}])
- ])
-])
-fi
+PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto])
dnl
dnl PNG decoder module
dnl
dnl libfluidsynth (MIDI synthetizer) plugin
dnl
-AC_ARG_ENABLE(fluidsynth,
- [ --enable-fluidsynth MIDI synthesisr with libfluidsynth (default enabled)])
-AS_IF([test "x${enable_fluidsynth}" != "xno"], [
- PKG_CHECK_MODULES(FLUIDSYNTH, fluidsynth, [
- VLC_ADD_PLUGIN(fluidsynth)
- VLC_ADD_CFLAGS(fluidsynth, [${FLUIDSYNTH_CFLAGS}])
- VLC_ADD_LIBS(fluidsynth, [${FLUIDSYNTH_LIBS}])
- ], [
- AS_IF([test "x${enable_fluidsynth}" != "x"], [
- AC_MSG_ERROR([${FLUIDSYNTH_PKG_ERRORS}])
- ])
- ])
-])
+PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto])
dnl
dnl Teletext Modules
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])
])
-dnl
-dnl asa/csri subtitle rendering module
-dnl
-AC_ARG_ENABLE(csri,
- [ --enable-csri Subtitle support using CSRI / asa (default disabled)])
-AS_IF( [test "${enable_csri}" = "yes"], [
- PKG_CHECK_MODULES(CSRI,
- csri >= 0.1.0,
- [
- VLC_ADD_LDFLAGS([csri],[$CSRI_LIBS])
- VLC_ADD_CFLAGS([csri],[$CSRI_CFLAGS])
- VLC_ADD_PLUGIN([csri])
- ],[
- AC_MSG_WARN([CSRI helper library not found])
- ])
- ])
-
dnl
dnl libass subtitle rendering module
dnl
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])
],[
dnl
dnl tiger decoder plugin
dnl
-AC_ARG_ENABLE(tiger,
-[ --enable-tiger Tiger rendering library for Kate streams (default enabled)])
-AS_IF([test "${enable_tiger}" != "no"], [
- PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [
- AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.])
- VLC_ADD_CFLAGS([kate],[$TIGER_CFLAGS])
- VLC_ADD_LIBS([kate],[$TIGER_LIBS]) ],[
- AS_IF([test "x${enable_tiger}" != "x"], [
- AC_MSG_ERROR([libtiger does not appear to be installed on your system.])
- ])
- ])
-])
+PKG_ENABLE_MODULES_VLC([TIGER], [tiger >= 0.3.1], [Tiger rendering library for Kate streams],[auto])
dnl
AS_IF([test "${enable_x11}" != "no"], [
AC_CHECK_HEADERS(X11/Xlib.h, [
- VLC_ADD_PLUGIN([x11_screen])
- VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}])
- VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-
- VLC_ADD_PLUGIN([panoramix])
- VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
- VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])
-
VLC_ADD_PLUGIN([x11])
VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}])
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
VLC_ADD_PLUGIN([xcb])
+ VLC_ADD_PLUGIN([xcb_screen])
AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
VLC_ADD_PLUGIN([xcb_xv])
+ ], [
+ PKG_CHECK_MODULES(XCB_XV, [xcb-xv], [
+ VLC_ADD_PLUGIN([xcb_xv])
+ VLC_ADD_CFLAGS([xcb_xv], [-DXCB_XV_OLD])
+ ])
])
])
+ PKG_CHECK_MODULES(XCB_RANDR, [xcb-randr >= 1.3], [
+ VLC_ADD_PLUGIN([panoramix])
+ VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS}])
+ VLC_ADD_CFLAGS([panoramix],[${XCB_RANDR_CFLAGS} ${XCB_CFLAGS}])
+ ], [true])
+
dnl xcb-utils
PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms])
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"
dnl
dnl SVG module
dnl
-AC_ARG_ENABLE(svg,
- [ --enable-svg SVG support (default disabled)])
-if test "${enable_svg}" = "yes"
-then
- PKG_CHECK_MODULES(SVG,
- librsvg-2.0 >= 2.9.0,
- [
- VLC_ADD_LIBS([svg],[$SVG_LIBS])
- VLC_ADD_CFLAGS([svg],[$SVG_CFLAGS])
- VLC_ADD_PLUGIN([svg]) ],
- [AC_MSG_WARN(SVG library not found)])
-fi
+PKG_ENABLE_MODULES_VLC([SVG], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto])
dnl
dnl Snapshot vout module (with cache)
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}" = "darwin"], [enable_qt4=no])
])
AS_IF([test "${enable_qt4}" != "no"], [
- PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.2], [
+ PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [
VLC_ADD_PLUGIN([qt4])
AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
ALIASES="${ALIASES} qvlc"
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
fi
fi
+dnl
+dnl libprojectM visualization plugin
+dnl
+AC_ARG_ENABLE(projectm,
+ [ --enable-projectm projectM visualization plugin (default disabled)])
+AS_IF([test "${enable_projectm}" = "yes"],
+ [
+ PKG_CHECK_MODULES(PROJECTM, libprojectM,
+ [
+ VLC_ADD_PLUGIN([projectm])
+ VLC_ADD_CXXFLAGS([projectm],[$PROJECTM_CFLAGS])
+ VLC_ADD_LIBS([projectm],[$PROJECTM_LIBS])
+ ],[
+ AC_MSG_WARN(libprojectM library not found)
+ ])
+ ])
+
dnl
dnl AtmoLight (homebrew AmbiLight)
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])
[
AC_PATH_PROGS(MOZILLA_CONFIG,
[mozilla-config seamonkey-config xulrunner-config],
- AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
- )
+ [no])
+ test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
]
)
dnl pkg-config failed but we might have found a mozilla-config