vlclibdir="\${libdir}/\${PKGDIR}"
AC_SUBST(vlclibdir)
-dnl
-dnl Deprecated options
-dnl to notify packagers that stuff has changed
-dnl
-AC_ARG_ENABLE(python-bindings,
- [ --enable-python-bindings Always fails for historical reasons)],,
- [enable_python_bindings="no"])
-AS_IF([test "${enable_python_bindings}" != "no"], [
- AC_MSG_ERROR([Python bindings are now built from a separate source package])
-])
-
-AC_ARG_ENABLE(java-bindings,
- [ --enable-java-bindings Always fails for historical reasons],,
- [enable_java_bindings="no"])
-AS_IF([test "${enable_java_bindings}" != "no"], [
- AC_MSG_ERROR([Java bindings are now built from a separate source package])
-])
-
dnl
dnl Save *FLAGS
dnl
with_cyberlink_tree=${CONTRIB_DIR}/src/clinkcc
fi
- if test ".`uname -s`" = ".Darwin"; then
+ if test "${SYS}" = "darwin"; then
export LD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH
- elif test ".`uname -s`" = ".BeOS"; then
+ elif test "${SYS}" = "beos"; then
export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH
export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES
fi
CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}"
LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names"; LDFLAGS="${LDFLAGS_save}"
- VLC_ADD_LDFLAGS([mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
- VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
- VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
- VLC_ADD_LDFLAGS([libvlc],[-Wl,-undefined,dynamic_lookup])
+ VLC_ADD_LDFLAGS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
+ VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-undefined,dynamic_lookup])
VLC_ADD_LDFLAGS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
VLC_ADD_LDFLAGS([libvlccore],[-Wl,-framework,CoreFoundation])
- VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation])
AC_ARG_ENABLE(macosx-defaults,
AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration on Mac OS X (default enabled)]))
if test "x${enable_macosx_defaults}" != "xno"
fi
;;
darwin9*)
- if (test ".`uname -p`" = ".i386"); then
+ if test "${host_cpu}" = "i386"; then
dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code
dnl without hacking it a lot, we disable mmx and sse.
dnl (that bug is about ld being unable to handle
# add ws2_32 for closesocket, select, recv
VLC_ADD_LIBS([libvlccore],[-lws2_32 -lnetapi32 -lwinmm])
VLC_ADD_LDFLAGS([vlc],[-mwindows])
- VLC_ADD_LIBS([activex mozilla],[-lgdi32])
+ VLC_ADD_LIBS([activex mozilla win32text],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-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 oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[-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 oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
VLC_ADD_LIBS([filesystem], [-lshlwapi])
dnl
dnl DEP and ASLR options
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 access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
VLC_ADD_CXXFLAGS([beos],[])
VLC_ADD_LIBS([vlc libvlccore logger],[-lbe])
- VLC_ADD_LIBS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
VLC_ADD_LIBS([dvdnav dvdread],[-ldl])
VLC_ADD_LIBS([filesystem],[-lpoll])
LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
else
VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet])
fi
-
- dnl Ugly check for Zeta
- if test -f /boot/beos/system/lib/libzeta.so; then
- VLC_ADD_LIBS([beos],[-lzeta])
- fi
;;
*)
SYS="${host_os}"
need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign posix_fadvise posix_madvise posix_memalign putenv setenv stricmp strnicmp tdestroy uselocale])
+AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale])
AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
AC_CHECK_FUNCS(send,,[
AC_CHECK_LIB(socket,send,[
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp access_output_rtmp stream_out_standard growl_udp remoteosd],[-lsocket])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp access_output_rtmp stream_out_standard growl_udp remoteosd netsync],[-lsocket])
])
])
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
+ VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo opengl],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm])
ac_cv_my_have_dlopen=yes,
AC_CHECK_LIB(dl, dlopen,
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlccore realaudio realvideo lua],[-ldl]),
+ VLC_ADD_LIBS([libvlccore realvideo lua],[-ldl]),
AC_CHECK_LIB(svld, dlopen,
ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlccore],[-lsvld]))))
THREAD_LIB=""
fi
-VLC_ADD_LIBS([libvlccore libvlc plugin],[${THREAD_LIB}])
+VLC_ADD_LIBS([libvlccore libvlc vlc plugin],[${THREAD_LIB}])
AC_CHECK_LIB(rt, clock_nanosleep, [
VLC_ADD_LIBS([libvlccore],[-lrt])
VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS])
VLC_ADD_CFLAGS([zip],[$MINIZIP_CFLAGS])
VLC_ADD_LIBS([skins2 zip],[$MINIZIP_LIBS])
- VLC_ADD_PLUGIN([unzip])
- VLC_ADD_PLUGIN([zip])
+ VLC_ADD_PLUGIN([unzip zip])
fi
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
dnl
dnl default modules
dnl
-dnl Video filters:
-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])
-VLC_ADD_PLUGIN([ripple])
-VLC_ADD_PLUGIN([psychedelic])
-VLC_ADD_PLUGIN([gradient])
-VLC_ADD_PLUGIN([ball])
-VLC_ADD_PLUGIN([motionblur])
-VLC_ADD_PLUGIN([rv32])
-VLC_ADD_PLUGIN([rotate])
-VLC_ADD_PLUGIN([noise])
-VLC_ADD_PLUGIN([grain])
-VLC_ADD_PLUGIN([extract])
-VLC_ADD_PLUGIN([sharpen])
-VLC_ADD_PLUGIN([croppadd])
-VLC_ADD_PLUGIN([canvas])
-VLC_ADD_PLUGIN([blendbench])
-VLC_ADD_PLUGIN([blend])
-VLC_ADD_PLUGIN([scale])
-VLC_ADD_PLUGIN([vmem])
-VLC_ADD_PLUGIN([logo])
-VLC_ADD_PLUGIN([audiobargraph_v])
-VLC_ADD_PLUGIN([magnify])
-VLC_ADD_PLUGIN([puzzle])
-VLC_ADD_PLUGIN([colorthres])
-VLC_ADD_PLUGIN([scene])
-VLC_ADD_PLUGIN([yuv])
-
-ALIASES="${ALIASES} cvlc"
-
-dnl
-dnl default modules that need g++
-dnl
-AC_LANG_PUSH(C++)
-VLC_ADD_PLUGIN([spatializer])
-AC_LANG_POP(C++)
-
-if test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([gestures])
- VLC_ADD_PLUGIN([oldrc])
- VLC_ADD_PLUGIN([hotkeys])
- VLC_ADD_PLUGIN([showintf])
- VLC_ADD_PLUGIN([marq])
- VLC_ADD_PLUGIN([podcast])
- VLC_ADD_PLUGIN([shout])
- VLC_ADD_PLUGIN([sap])
- VLC_ADD_PLUGIN([mediadirs])
- VLC_ADD_PLUGIN([fake])
- VLC_ADD_PLUGIN([folder])
- VLC_ADD_PLUGIN([rss])
- VLC_ADD_PLUGIN([mosaic])
- VLC_ADD_PLUGIN([wall])
- VLC_ADD_PLUGIN([motiondetect])
- VLC_ADD_PLUGIN([clone])
- VLC_ADD_PLUGIN([crop])
- VLC_ADD_PLUGIN([erase])
- VLC_ADD_PLUGIN([bluescreen])
- VLC_ADD_PLUGIN([alphamask])
- VLC_ADD_PLUGIN([gaussianblur])
- VLC_ADD_PLUGIN([i420_yuy2])
- VLC_ADD_PLUGIN([i422_yuy2])
- VLC_ADD_PLUGIN([i422_i420])
- VLC_ADD_PLUGIN([yuy2_i422])
- VLC_ADD_PLUGIN([yuy2_i420])
- VLC_ADD_PLUGIN([chain])
- VLC_ADD_PLUGIN([aout_file])
- VLC_ADD_PLUGIN([linear_resampler])
- VLC_ADD_PLUGIN([bandlimited_resampler])
- VLC_ADD_PLUGIN([float32_mixer])
- VLC_ADD_PLUGIN([spdif_mixer])
- VLC_ADD_PLUGIN([simple_channel_mixer])
- VLC_ADD_PLUGIN([dolby_surround_decoder])
- VLC_ADD_PLUGIN([headphone_channel_mixer])
- VLC_ADD_PLUGIN([normvol])
- VLC_ADD_PLUGIN([audiobargraph_a])
- VLC_ADD_PLUGIN([equalizer])
- VLC_ADD_PLUGIN([param_eq])
- VLC_ADD_PLUGIN([scaletempo])
- VLC_ADD_PLUGIN([a52tospdif])
- VLC_ADD_PLUGIN([dtstospdif])
- ALIASES="${ALIASES} rvlc"
-fi
-
-if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGIN([chain])
- VLC_ADD_PLUGIN([aout_file])
- VLC_ADD_PLUGIN([linear_resampler])
- VLC_ADD_PLUGIN([bandlimited_resampler])
- VLC_ADD_PLUGIN([float32_mixer])
- VLC_ADD_PLUGIN([spdif_mixer])
- VLC_ADD_PLUGIN([simple_channel_mixer])
- VLC_ADD_PLUGIN([headphone_channel_mixer])
- VLC_ADD_PLUGIN([normvol])
- VLC_ADD_PLUGIN([audiobargraph_a])
- VLC_ADD_PLUGIN([a52tospdif])
- VLC_ADD_PLUGIN([dtstospdif])
- VLC_ADD_PLUGIN([i420_yuy2])
- VLC_ADD_PLUGIN([i422_yuy2])
- VLC_ADD_PLUGIN([i422_i420])
- VLC_ADD_PLUGIN([yuy2_i422])
- VLC_ADD_PLUGIN([yuy2_i420])
-fi
+ALIASES="${ALIASES} cvlc rvlc"
dnl
dnl Some plugins aren't useful on some platforms
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([motion])
VLC_ADD_PLUGIN([dynamicoverlay])
- VLC_ADD_PLUGIN([signals])
elif test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([ntservice])
- VLC_ADD_PLUGIN([access_smb])
- VLC_ADD_PLUGIN([dmo])
- VLC_ADD_PLUGIN([msn])
+ VLC_ADD_PLUGIN([access_smb dmo globalhotkeys])
VLC_ADD_LIBS([dmo],[-lole32 -luuid])
- VLC_ADD_PLUGIN([globalhotkeys])
-else
- VLC_ADD_PLUGIN([win32text])
fi
if test "${SYS}" = "darwin"; then
- VLC_ADD_PLUGIN([quartztext])
VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices])
fi
dnl
PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto])
-dnl
-dnl Audioscrobbler plugin
-dnl
-
-AC_ARG_ENABLE(audioscrobbler,
- [ --disable-audioscrobbler Last.fm submission plugin (default enabled)])
-AS_IF([test "${enable_audioscrobbler}" != "no"], [
- VLC_ADD_PLUGIN([audioscrobbler])
- ])
-
dnl
dnl Taglibplugin
dnl
dnl live555 input
dnl
-if test "${enable_livedotcom}"
-then
- AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
-fi
-if test "${enable_livedotcom}" = "no"
-then
- enable_live555="no"
-fi
-
AC_ARG_ENABLE(live555,
[ --enable-live555 live555 RTSP input plugin (default enabled)])
if test "${enable_live555}" != "no"; then
dnl
dnl test for --with-live555-tree
dnl
- if test "${with_livedotcom_tree}"
- then
- AC_MSG_WARN(--with-livedotcom-tree is deprecated. Use --with-live555-tree instead.)
- with_live555_tree="${with_livedotcom_tree}"
- fi
-
if test -z "${with_live555_tree}" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++)
CPPFLAGS_save="${CPPFLAGS}"
dnl dvdread module: check for libdvdread
dnl
AC_ARG_ENABLE(dvdread,
-[ --enable-dvdread dvdread input module (default disabled)])
+[ --enable-dvdread dvdread input module (default enabled)])
if test "${enable_dvdread}" != "no"
then
AC_ARG_WITH(dvdread,
else
PKG_CHECK_MODULES(OPENCV, opencv,
[
- VLC_ADD_PLUGIN([opencv_example])
- VLC_ADD_PLUGIN([opencv_wrapper])
+ VLC_ADD_PLUGIN([opencv_example opencv_wrapper])
VLC_ADD_LIBS([opencv_example opencv_wrapper],[${OPENCV_LIBS}])
VLC_ADD_CFLAGS([opencv_wrapper],[${OPENCV_CFLAGS}])
VLC_ADD_CXXFLAGS([opencv_example],[${OPENCV_CFLAGS}])
dnl
PKG_ENABLE_MODULES_VLC([GNOMEVFS], [access_gnomevfs], [gnome-vfs-2.0], [GnomeVFS access module], [auto])
-
-dnl Need to test libcdio and libvcdinfo for a number of things. Do it now.
-AC_ARG_ENABLE(libcdio,
- [ --enable-libcdio CD input and control library support (default enabled)])
-
-AC_ARG_ENABLE(libvcdinfo,
- [ --enable-libvcdinfo VCD information library support (default enabled)])
-
-have_libcdio=no
-have_libvcdinfo=no
-if test "${enable_libcdio}" != "no"
-then
- PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.78.2,
- have_libcdio=yes
- AC_DEFINE(HAVE_LIBCDIO, 1,
- [Define if you have libcdio 0.78.2 or greater installed]),
- [AC_MSG_WARN(CD Reading and information library not found)])
-
- if test "${enable_libvcdinfo}" != "no"
- then
- PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
- [have_libvcdinfo=yes],
- [AC_MSG_WARN(VCD information library not found)])
- fi
-fi
-
dnl
dnl VCDX modules
dnl
if test "${enable_vcdx}" = "yes"
then
- if test "${have_libvcdinfo}" = "yes"
- then
- VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
- VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])
- else
- AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled])
- HAVE_VCDX=no
- fi
-
- PKG_CHECK_MODULES(LIBCDIO, libiso9660 >= 0.72,
- [VLC_ADD_LIBS([vcdx],[$LIBISO9660_LIBS])
- VLC_ADD_CFLAGS([vcdx],[$LIBISO9660_CFLAGS])],
- [AC_MSG_WARN([vcdx plugin disabled because ok libiso9660 library not found])
- HAVE_VCDX=no])
-
- if test "$have_libvcdinfo" = "yes"
- then
- AC_DEFINE(HAVE_VCDX, 1,
- [Define for the VCD plugin using libcdio/libvcdinfo])
- VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
- VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])
- VLC_ADD_PLUGIN([vcdx])
- else
- AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found])
- HAVE_VCDX=no
- fi
+ PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72],
+ [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS])
+ VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])],
+ [AC_MSG_ERROR([vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72])])
+ PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
+ [VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+ VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])],
+ [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >= 0.7.22])])
+ VLC_ADD_PLUGIN([vcdx])
fi
dnl
dnl Built-in CD-DA and VCD module
dnl
-AC_ARG_ENABLE(cdda,
- [ --enable-cdda audio CD via built-in VCD (default enabled)])
-
AC_ARG_ENABLE(vcd,
- [ --enable-vcd built-in VCD (default enabled)])
+ [ --enable-vcd built-in VCD and CD-DA (default enabled)])
AC_ARG_ENABLE(libcddb,
[ --enable-libcddb CDDB support for libcdio audio CD (default enabled)])
AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h)
AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
],[
AC_MSG_RESULT(no)
])
AC_MSG_CHECKING(for scsireq in sys/scsiio.h)
AC_EGREP_HEADER(scsireq,sys/scsiio.h,[
AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support)
],[
AC_MSG_RESULT(no)
AC_MSG_CHECKING(for ioc_toc_header in sys/cdio.h)
AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[
AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support)
],[
AC_MSG_RESULT(no)
if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32"
then
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
fi
if test "${SYS}" = "darwin"
then
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
VLC_ADD_LDFLAGS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LIBS([vcdx cdda],[-liconv])
fi
dnl
dnl avcodec decoder/encoder plugin
dnl
-
-if test "${with_ffmpeg_tree}"
-then
- AC_MSG_WARN([--with-ffmpeg-tree is deprecated. Use PKG_CONFIG_PATH instead.])
-fi
-
AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
if test "${enable_avcodec}" != "no"
AS_IF([test "x${have_avcodec}" = "xyes"], [
PKG_CHECK_MODULES(LIBVA, [libva libva-x11],
[
+ VLC_SAVE_FLAGS
+ CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
+ CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
AC_CHECK_HEADERS(libavcodec/vaapi.h, [
VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
[AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
[AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
])
+ VLC_RESTORE_FLAGS
],[
AS_IF([test "${enable_libva}" == "yes"],
[AC_MSG_ERROR([Could not find required libva.])],
AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h)
AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
AS_IF([test "$enable_merge_ffmpeg" = "no"], [
- VLC_ADD_PLUGIN([avformat])
- VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS $AVUTIL_LIBS])
- VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
-
- VLC_ADD_PLUGIN([access_avio])
- VLC_ADD_LIBS([access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
- VLC_ADD_CFLAGS([access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+ VLC_ADD_PLUGIN([avformat access_avio])
+ VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([avformat access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
], [
VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
AC_ARG_ENABLE(real,
[ --enable-real Real media module (default disabled)])
if test "${enable_real}" = "yes"; then
- VLC_ADD_PLUGIN([realaudio])
VLC_ADD_PLUGIN([realvideo])
fi
dnl
dnl DTS Coherent Acoustics decoder plugin
dnl
-AS_IF([test "x${enable_dts}" != "x"], [
- AC_MSG_ERROR([--enable-dts is obsolete. Please use libdca and --enable-dca.])
-])
PKG_ENABLE_MODULES_VLC([DCA], [dtstofloat32], [libdca >= 0.0.5], [DTS Coherent Acoustics support with libdca], [auto])
dnl
LDFLAGS="${LDFLAGS_save} -lz"
AC_CHECK_LIB(png, png_set_rows, [
VLC_ADD_LIBS([png],[-lpng -lz])
- VLC_ADD_PLUGIN([png])
- VLC_ADD_PLUGIN([osdmenu])
- VLC_ADD_PLUGIN([osd_parser])],
+ VLC_ADD_PLUGIN([png osdmenu osd_parser])],
[],[-lz])
LDFLAGS="${LDFLAGS_save}"
])
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
- VLC_ADD_PLUGIN([screensaver])
- VLC_ADD_PLUGIN([xcb_x11])
- VLC_ADD_PLUGIN([xcb_screen])
- VLC_ADD_PLUGIN([xcb_apps])
+ VLC_ADD_PLUGIN([screensaver xcb_x11 xcb_screen xcb_apps])
VLC_SET_CFLAGS_WERROR([xcb_screen], [-Wno-error=uninitialized]) # some gcc report a warning which doesn't reveal an error
AS_IF([test "${enable_xvideo}" != "no"], [
AS_IF([test "${have_xcb_keysyms}" = "yes"], [
PKG_CHECK_MODULES(XPROTO, [xproto])
- VLC_ADD_PLUGIN([xcb_window])
- VLC_ADD_PLUGIN([globalhotkeys])
+ VLC_ADD_PLUGIN([xcb_window globalhotkeys])
VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}])
VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
])
PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [
# SDL on Darwin is heavily patched and can only run SDL_image
if test "${SYS}" != "darwin"; then
- VLC_ADD_PLUGIN([vout_sdl])
- VLC_ADD_PLUGIN([aout_sdl])
+ VLC_ADD_PLUGIN([vout_sdl aout_sdl])
fi
VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --cflags | sed 's,SDL,,'`])
VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`])
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
then
AC_CHECK_HEADERS(ddraw.h,
- [ VLC_ADD_PLUGIN([directx])
- VLC_ADD_PLUGIN([aout_directx])
+ [ VLC_ADD_PLUGIN([directx aout_directx])
VLC_ADD_LIBS([directx],[-lgdi32])
],[AC_MSG_ERROR([Cannot find DirectX headers!])]
)
VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32])
fi
if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGIN([wingdi])
- VLC_ADD_PLUGIN([wingapi])
+ VLC_ADD_PLUGIN([wingdi wingapi])
VLC_ADD_LIBS([wingdi],[-laygshell])
VLC_ADD_LIBS([wingapi],[-laygshell])
fi
test "${enable_oss}" = "yes")
then
AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [
- VLC_ADD_PLUGIN([oss])
- VLC_ADD_PLUGIN([access_oss])
- AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss],[-lossaudio])
- VLC_ADD_LIBS([access_oss],[-lossaudio])])
+ VLC_ADD_PLUGIN([oss access_oss])
+ AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss access_oss],[-lossaudio])])
])
fi
dnl
dnl ALSA module
dnl
-PKG_ENABLE_MODULES_VLC([ALSA], [], [alsa >= 1.0.0], [Alsa sound support for linux], [auto])
-PKG_ENABLE_MODULES_VLC([ACCESS_ALSA], [access_alsa], [alsa >= 1.0.0], [Alsa access for linux], [auto])
+PKG_ENABLE_MODULES_VLC([ALSA], [alsa access_alsa], [alsa >= 1.0.0], [Alsa sound support for linux], [auto])
dnl
dnl win32 waveOut plugin
dnl
dnl JACK modules
dnl
-PKG_ENABLE_MODULES_VLC([JACK], [jack], [jack], [JACK audio I/O modules],[auto])
-PKG_ENABLE_MODULES_VLC([JACK], [access_jack], [jack], [JACK audio I/O modules],[auto])
+PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto])
dnl
AC_ARG_WITH(,[Interface plugins:])
-dnl special case for BeOS
-if test "${SYS}" = "beos"
-then
- VLC_ADD_PLUGIN([beos])
-fi
-
dnl
dnl Skins2 module
dnl
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] )
- VLC_ADD_PLUGIN([macosx])
- VLC_ADD_PLUGIN([minimal_macosx])
+ VLC_ADD_PLUGIN([macosx minimal_macosx])
fi
dnl
dnl ncurses module
dnl
AC_ARG_ENABLE(ncurses,
- [ --disable-ncurses ncurses interface support (default enabled)],
+ [ --disable-ncurses ncurses interface support (default disabled)],
[if test "${enable_ncurses}" != "no"; then
AC_CHECK_HEADER(ncurses.h,
[AC_CHECK_LIB(ncursesw, mvprintw,
PKG_ENABLE_MODULES_VLC([PROJECTM], [], [libprojectM], [projectM visualization plugin], [auto])
dnl
-dnl AtmoLight (homebrew AmbiLight)
+dnl AtmoLight (homemade Philips Ambilight clone)
dnl
AC_ARG_ENABLE(atmo,
-AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew Philips ambilight)
- (broken, default disabled)]),, [enable_atmo="no"])
+AS_HELP_STRING([--disable-atmo],[AtmoLight (homemade Philips Ambilight clone)
+ (default enabled)]),, [enable_atmo="yes"])
AS_IF([test "${enable_atmo}" != no], [
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "linux"], [
AC_LANG_PUSH(C++)
VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
AS_IF([test "${SYS}" = "mingw32"], [
dnl pkg-config --libs gnutls omits these
- VLC_ADD_LIBS([gnutls], [-lz])
- VLC_ADD_LIBS([gnutls], [${LTLIBINTL}])
+ VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL}])
])
dnl The GnuTLS plugin invokes gcry_control directly.
AS_IF([test "${have_libgcrypt}" = "yes"],[
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGIN([dmo])
- VLC_ADD_CPPFLAGS([dmo],[-I\\\${top_srcdir}/libs/loader])
- VLC_ADD_LIBS([dmo],[\\\${top_builddir}/libs/loader/libloader.la -lpthread])
- VLC_ADD_CPPFLAGS([quicktime],[-I\\\${top_srcdir}/libs/loader])
- VLC_ADD_LIBS([quicktime],[\\\${top_builddir}/libs/loader/libloader.la -lpthread])
- VLC_ADD_CPPFLAGS([realaudio],[-I\\\${top_srcdir}/libs/loader -DLOADER])
- VLC_ADD_LIBS([realaudio],[\\\${top_builddir}/libs/loader/libloader.la])
- VLC_ADD_CPPFLAGS([realvideo],[-I\\\${top_srcdir}/libs/loader -DLOADER])
- VLC_ADD_LIBS([realvideo],[\\\${top_builddir}/libs/loader/libloader.la])
+ VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/libs/loader])
+ VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/libs/loader/libloader.la])
+ VLC_ADD_CPPFLAGS([realvideo], [-DLOADER])
+ VLC_ADD_LIBS([dmo quicktime], [-lpthread])
])
AC_ARG_WITH(,[Components:])
dnl this one is needed until automake knows what to do
VLC_ADD_LIBS([test3],[-lobjc])
- VLC_ADD_PLUGIN([test1])
- VLC_ADD_PLUGIN([test2])
- VLC_ADD_PLUGIN([test3])
- VLC_ADD_PLUGIN([test4])
+ VLC_ADD_PLUGIN([test1 test2 test3 test4])
fi
dnl
AC_SUBST(VERSION_EXTRA)
AC_SUBST(COPYRIGHT_YEARS)
AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s 2>/dev/null || hostname`", [host which ran configure])
-AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure])
+AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure])
AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
dnl Win32 need s a numerical version_extra.
case $( echo ${VERSION_EXTRA}|wc -m ) in
projects/mozilla/npvlc_rc.rc
projects/mozilla/vlc.r
projects/mozilla/install.js
+ projects/mozilla/install.rdf
share/Makefile
- share/vlc_win32_rc.rc
- share/libvlc_win32_rc.rc
compat/Makefile
src/Makefile
src/test/Makefile
modules/demux/mpeg/Makefile
modules/demux/playlist/Makefile
modules/gui/Makefile
- modules/gui/beos/Makefile
modules/gui/macosx/Makefile
modules/gui/hildon/Makefile
modules/gui/minimal_macosx/Makefile
USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac`
dnl Shortcut to nice compile message
rm -f compile
-echo '#! /bin/sh' >compile
+if test -n $SHELL; then
+ SHELL=${CONFIG_SHELL-/bin/sh}
+fi
+echo '#! '$SHELL >compile
echo rm -f .error\$\$ >>compile
echo ERROR=0 >>compile
echo export PATH=$PATH LANG=C >>compile
projects / vlc / blobdiff