X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=467640d03164c10b0a2d9d5d3ddeab92fbf85010;hb=1af9a2da59e52ae7ec083fcd0b359d4d9e297aac;hp=753e21d342febc10f0a0fbd1223d921cf5e1e8d9;hpb=430be231b62977db7a191808fdff7e0a4d5a23d6;p=vlc diff --git a/configure.ac b/configure.ac index 753e21d342..467640d031 100644 --- a/configure.ac +++ b/configure.ac @@ -49,24 +49,6 @@ AC_SUBST(vlcdatadir) 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 @@ -160,10 +142,10 @@ AC_ARG_WITH(contrib, 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 @@ -215,14 +197,11 @@ case "${host_os}" in 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" @@ -294,7 +273,7 @@ case "${host_os}" in 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 @@ -345,9 +324,9 @@ case "${host_os}" in # 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 @@ -361,7 +340,7 @@ case "${host_os}" in 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 ;; @@ -380,7 +359,6 @@ case "${host_os}" in 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}" @@ -390,11 +368,6 @@ case "${host_os}" in 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}" @@ -568,7 +541,7 @@ dnl Check for system libs needed 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.]) @@ -592,7 +565,7 @@ AC_SUBST(SOCKET_LIBS) 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]) ]) ]) @@ -706,7 +679,7 @@ AC_CHECK_LIB(m,cos,[ 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]) @@ -782,7 +755,7 @@ if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then 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])))) @@ -809,7 +782,7 @@ if test "${THREAD_LIB}" = "error"; then 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]) @@ -938,8 +911,7 @@ then 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" ]) @@ -1167,33 +1139,18 @@ test "${enable_cprof}" != "yes" && enable_cprof="no" dnl dnl default modules dnl -ALIASES="${ALIASES} cvlc" - -if test "${SYS}" != "mingwce"; then - VLC_ADD_PLUGIN([oldrc]) - VLC_ADD_PLUGIN([mediadirs]) - ALIASES="${ALIASES} rvlc" -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 @@ -1753,16 +1710,6 @@ dnl Libnotify notification plugin 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 @@ -1784,15 +1731,6 @@ AC_ARG_WITH(,[Input plugins:]) 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 @@ -1802,12 +1740,6 @@ 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}" @@ -1927,7 +1859,7 @@ dnl 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, @@ -2094,8 +2026,7 @@ then 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}]) @@ -2350,32 +2281,6 @@ dnl gnomeVFS access module 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 @@ -2384,42 +2289,22 @@ AC_ARG_ENABLE(vcdx, 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)]) @@ -2429,8 +2314,7 @@ then 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) ]) @@ -2438,8 +2322,7 @@ then 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) @@ -2448,8 +2331,7 @@ then 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) @@ -2457,14 +2339,12 @@ then 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 @@ -2814,12 +2694,6 @@ AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"]) 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" @@ -2851,6 +2725,9 @@ AS_IF([test "${enable_libva}" != "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]) @@ -2861,6 +2738,7 @@ AS_IF([test "${enable_libva}" != "no"], [ [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.])], @@ -2938,13 +2816,9 @@ then 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]) @@ -3077,7 +2951,6 @@ dnl 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 @@ -3191,9 +3064,6 @@ AC_ARG_WITH(a52-fixed, 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 @@ -3254,9 +3124,7 @@ AC_CHECK_HEADERS(png.h, [ 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}" ]) @@ -3493,10 +3361,7 @@ AS_IF([test "${enable_xcb}" != "no"], [ 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"], [ @@ -3531,8 +3396,7 @@ AS_IF([test "${enable_xcb}" != "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}]) ]) @@ -3596,8 +3460,7 @@ then 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,,'`]) @@ -3735,8 +3598,7 @@ then 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!])] ) @@ -3763,8 +3625,7 @@ if test "${enable_wingdi}" != "no"; then 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 @@ -3938,10 +3799,8 @@ if test "${enable_oss}" != "no" && 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 @@ -3958,8 +3817,7 @@ PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library supp 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 @@ -4009,8 +3867,7 @@ fi 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 @@ -4097,12 +3954,6 @@ 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 @@ -4233,8 +4084,7 @@ then 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 @@ -4292,7 +4142,7 @@ 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, @@ -4383,11 +4233,11 @@ dnl 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++) @@ -4475,8 +4325,7 @@ AS_IF([test "${enable_gnutls}" != "no"], [ 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"],[ @@ -4605,14 +4454,10 @@ AC_ARG_ENABLE(loader, 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:]) @@ -4860,10 +4705,7 @@ then 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 @@ -4912,8 +4754,7 @@ AC_SUBST(VERSION_REVISION) 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 @@ -4989,9 +4830,8 @@ AC_CONFIG_FILES([ 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 @@ -5036,7 +4876,6 @@ AC_CONFIG_FILES([ 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 @@ -5090,7 +4929,10 @@ dnl Do we have to use make or gmake ? 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