X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=5da476e1d05b67912ad9dfdb0e0bfc75de5bc42e;hb=9477ef1f3b824dbae9a57a7f918f5809d3f0027f;hp=a2d8c3a8f8fdd9907def6f58dc6fb991ee74cbe8;hpb=618b77f969dc2ca2e64f60192799a58308a1d40d;p=vlc diff --git a/configure.ac b/configure.ac index a2d8c3a8f8..5da476e1d0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team]) +AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team]) AC_INIT(vlc, 1.2.0-git) VERSION_MAJOR="1" @@ -12,7 +12,7 @@ AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Twoflower" -COPYRIGHT_YEARS="1996-2010" +COPYRIGHT_YEARS="1996-2011" AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) @@ -95,7 +95,7 @@ AS_IF([test -n "${with_binary_version}"],[ ]) dnl Check how we are asked to build -AS_IF([test "${enable_shared}" = "no"], [ +AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.]) ]) @@ -330,7 +330,7 @@ case "${host_os}" in VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([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 oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-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 oldhttp stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp 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 @@ -338,7 +338,7 @@ case "${host_os}" in AC_ARG_ENABLE(peflags, [ --enable-peflags peflags use (default enabled on Windows)]) if test "${enable_peflags}" != "no" ; then - AC_CHECK_TOOL(PEFLAGS, peflags, :) + AC_PATH_TOOL(PEFLAGS, peflags, :) fi AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) ac_default_prefix="`pwd`/_win32" @@ -361,7 +361,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_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-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_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2]) VLC_ADD_LIBS([libvlccore],[-lmmtimer]) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) ac_default_prefix="`pwd`/_wince" @@ -389,6 +389,7 @@ AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"]) AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") +AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian") AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"]) dnl @@ -546,8 +547,8 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp tdestroy uselocale]) -AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf]) +AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) +AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -556,7 +557,7 @@ AC_CHECK_FUNCS(fdatasync,, AC_FUNC_STRCOLL dnl Check for non-standard system calls -AC_CHECK_FUNCS([accept4 dup3 eventfd vmsplice sched_getaffinity]) +AC_CHECK_FUNCS([accept4 dup3 pipe2 eventfd vmsplice sched_getaffinity]) AH_BOTTOM([#include ]) @@ -795,6 +796,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ AC_MSG_RESULT(no)]) dnl Check for headers +AC_CHECK_HEADERS([search.h]) AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h) AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h) AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h]) @@ -1125,7 +1127,7 @@ dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - VLC_ADD_PLUGIN([dynamicoverlay]) + VLC_ADD_PLUGIN([dynamicoverlay access_shm]) elif test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([access_smb dmo globalhotkeys]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) @@ -1479,8 +1481,10 @@ if test -n "${with_tuning}"; then CFLAGS_TUNING="-mtune=${with_tuning}" fi else - if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then + if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then CFLAGS_TUNING="-march=prescott -mtune=generic" + elif test "${SYS}" = "darwin" -a "${host_cpu}" = "x86_64"; then + CFLAGS_TUNING="-march=core2 -mtune=core2" 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 @@ -1684,7 +1688,7 @@ AS_IF([test "${enable_growl}" != "no"], [ dnl dnl Libnotify notification plugin dnl -PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto]) +PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto]) dnl dnl Taglibplugin @@ -1837,10 +1841,27 @@ fi dnl dnl - special access module for dc1394 input dnl - dv module: digital video module check for libraw1394 +dnl - linsys modules: access module check for libzvbi dnl PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto]) PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto]) +AC_ARG_ENABLE(linsys, + [ --enable-linsys Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)]) +case "${SYS}" in + linux*) +if test "${enable_linsys}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then + VLC_ADD_PLUGIN([linsys_hdsdi]) + PKG_CHECK_MODULES(LINSYS_SDI, zvbi-0.2 >= 0.2.28, + [ VLC_ADD_LIBS([linsys_sdi],[$LINSYS_SDI_LIBS]) + VLC_ADD_CFLAGS([linsys_sdi],[$LINSYS_SDI_CFLAGS]) + VLC_ADD_PLUGIN([linsys_sdi]) ], + [AC_MSG_WARN([Couldn't find zvbi >= 0.2.28, install libzvbi-dev ?])] + ) +fi +;; +esac + dnl dnl dvdread module: check for libdvdread dnl @@ -1867,8 +1888,8 @@ then [], [${LIBS_dvdnav}]) AC_CHECK_LIB(dvdnav, dvdnav_describe_title_chapters, AC_DEFINE(HAVE_DVDNAV_DESCRIBE_TITLE_CHAPTERS, 1, [Define if you have dvdnav_describe_title_chapters.]), - [], [${LIBS_dvdnav}]) - ]) + [], [${LIBS_dvdnav}])], + [AC_MSG_WARN(dvdnav library not found)]) fi dnl @@ -2096,29 +2117,6 @@ AC_ARG_ENABLE(pvr, if test "${enable_pvr}" = "yes" then VLC_ADD_PLUGIN([pvr]) - AC_ARG_WITH(videodev2, - [ --with-videodev2=FILE Location of videodev2.h file (default /usr/include/linux/videodev2.h)],[],[]) - if test "${with_videodev2}" != "no" -a -n "${with_videodev2}" - then - AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h]) - fi - - AC_CACHE_CHECK([for new linux/videodev2.h], - [ac_cv_new_linux_videodev2_h], - [AC_TRY_COMPILE([ - #include - # ifdef VIDEODEV2_H_FILE - # include VIDEODEV2_H_FILE - # else - # include - # endif - ], - [struct v4l2_ext_controls ctrls; ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; ], - ac_cv_new_linux_videodev2_h=yes, - ac_cv_new_linux_videodev2_h=no)]) - if test "${ac_cv_new_linux_videodev2_h}" != "no"; then - AC_DEFINE(HAVE_NEW_LINUX_VIDEODEV2_H, 1, [Define if new linux/videodev2.h present]) - fi fi dnl @@ -2308,6 +2306,12 @@ AS_IF([test "${enable_gme}" != "no"], [ ]) +dnl +dnl SIDPlay plugin +dnl +PKG_ENABLE_MODULES_VLC([SID], [], [libsidplay2], [C64 sid demux support], [auto], [], [-lresid-builder]) + + dnl dnl ogg demux plugin dnl @@ -2356,14 +2360,14 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then AC_CHECK_LIB(ebml_pic, main, [ VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic]) - ], + ],[ AC_CHECK_LIB(ebml, main, [ VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml]) ]) - ) - ], - [AC_MSG_RESULT([no]) + ]) + ], [ + AC_MSG_RESULT([no]) AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.]) ]) ]) @@ -2444,6 +2448,31 @@ then VLC_ADD_LIBS([omxil], [$LIBDL]) fi +dnl +dnl CrystalHD codec plugin +dnl +AC_ARG_ENABLE(crystalhd, + [ --enable-crystalhd crystalhd codec plugin (default disabled)]) +if test "${enable_crystalhd}" == "yes"; then + AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [ + VLC_ADD_PLUGIN([crystalhd]) + VLC_ADD_LIBS([crystalhd], [-lcrystalhd]) + ],[ + if test "${SYS}" = "mingw32" ; then + AC_CHECK_HEADERS(libcrystalhd/bc_dts_defs.h, [ + VLC_ADD_PLUGIN([crystalhd]) + AC_CHECK_HEADERS(libcrystalhd/bc_drv_if.h, [ + VLC_ADD_LIBS([crystalhd], [-lbcmDIL]) + ]) + ],[ + AC_MSG_ERROR("Could not find CrystalHD development headers") + ]) + fi + ],[#define __LINUX_USER__ + #include + ]) +fi + dnl dnl mad plugin dnl @@ -2800,18 +2829,6 @@ if test "${enable_realrtsp}" = "yes"; then VLC_ADD_PLUGIN([access_realrtsp]) fi -dnl -dnl skins2 module -dnl -AC_ARG_ENABLE(libtar, - [ --enable-libtar libtar support for skins2 (default enabled)]) - -AS_IF([test "${enable_libtar}" != "no"],[ - AC_CHECK_HEADERS(libtar.h, [ - VLC_ADD_LIBS([skins2],[-ltar]) - ] ) -]) - dnl dnl A52/AC3 decoder plugin dnl @@ -2940,7 +2957,7 @@ PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto]) dnl dnl schroedinger decoder plugin (for dirac format video) dnl -PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto]) +PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.10], [dirac decoder and encoder using schroedinger], [auto]) dnl dnl PNG decoder module @@ -3630,22 +3647,6 @@ then VLC_ADD_LDFLAGS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) fi -dnl -dnl Roku HD1000 audio -dnl -AC_ARG_ENABLE(hd1000a, - [ --enable-hd1000a HD1000 audio module (default enabled on HD1000)]) -if test "${enable_hd1000a}" != "no" -a "${CXX}" != "" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_hd1000a}" = "yes") -then - AC_LANG_PUSH([C++]) - AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [ - VLC_ADD_PLUGIN([hd1000a]) - AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LIBS([hd1000a],[-lHDMachineX225])) ]) - AC_LANG_POP([C++]) -fi - dnl dnl JACK modules dnl @@ -3654,8 +3655,8 @@ PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modul dnl dnl UPnP Plugin (Intel SDK) dnl -PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto]) -VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}]) +PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto]) +VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}]) dnl dnl Interface plugins @@ -3666,50 +3667,52 @@ EXTEND_HELP_STRING([Interface plugins:]) dnl dnl Skins2 module dnl +AC_ARG_ENABLE(libtar, + [ --enable-libtar libtar support for skins2 (default auto)]) +AS_IF([test "${enable_libtar}" != "no"], [ + AC_CHECK_HEADERS(libtar.h, [ + VLC_ADD_LIBS([skins2],[-ltar]) + ]) +]) + AC_ARG_ENABLE(skins2, [AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default - enabled except on MacOSX and WinCE)])]) -if test "${enable_skins2}" != "no" || - (test "${SYS}" != "darwin" && - test "${SYS}" != "mingwce" && test "${enable_skins2}" == "yes"); then - - dnl test for the required libraries - skins2_missing_lib="no" - + enabled except on MacOSX and WinCE)])],, [ + AS_IF([test "${SYS}" != "darwin" && test "${SYS}" != "mingwce"], [ + enable_skins2="yes" + ], [ + enable_skins2="no" + ]) +]) +AS_IF([test "${enable_skins2}" = "yes"], [ dnl freetype - if test "${have_freetype}" != "yes"; then - skins2_missing_lib="yes" - if test "${enable_skins2}" = "yes"; then - AC_MSG_ERROR([Could not find freetype (required for skins2)]) - fi - fi + AS_IF([test "${have_freetype}" != "yes"], [ + AC_MSG_ERROR([Could not find FreeType (required for skins2)]) + ]) - if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32"); then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" + AS_IF([test "${SYS}" = "mingw32"], [ VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32]) - else if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "darwin"); then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" + ], [test "${SYS}" = "darwin"], [ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon]) - else if test "${skins2_missing_lib}" = "no"; then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" - VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS]) + ], [ + PKG_CHECK_MODULES([XPM], [xpm]) + PKG_CHECK_MODULES([XEXT], [xext]) + VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} {XPM_CFLAGS} -DX11_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lXpm -lX11]) + VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} -lX11]) need_xid_provider="no" - fi fi fi -fi -AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" || - (test "${SYS}" != "darwin" && - test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")]) + + ]) + VLC_ADD_PLUGIN([skins2]) + ALIASES="${ALIASES} svlc" +]) +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) dnl dnl Hildon UI @@ -3816,6 +3819,8 @@ then VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) + VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/BWToolKit -Wl,-framework,BWToolKitFramework]) + VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BWToolKit]) dnl For bug report VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) @@ -4086,24 +4091,22 @@ AS_IF([test "${enable_gnutls}" != "no"], [ dnl dnl RemoteOSD plugin (VNC client as video filter) dnl -AC_ARG_ENABLE(remoteosd, - [ --disable-remoteosd RemoteOSD plugin (default enabled)]) - -AS_IF([test "${enable_remoteosd}" != "no"], [ - AS_IF([test "${have_libgcrypt}" = "yes"],[ - VLC_ADD_PLUGIN([remoteosd]) - VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS}) - VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS}) - ], [ - AC_MSG_ERROR([libgcrypt support required for RemoteOSD plugin]) - ]) +AC_MSG_CHECKING([whether to enable the RemoteOSD plugin]) +AS_IF([test "${have_libgcrypt}" = "yes"],[ + AC_MSG_RESULT(yes) + VLC_ADD_PLUGIN([remoteosd]) + VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS}) + VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS}) +], [ + AC_MSG_RESULT(no) + AC_MSG_WARN([libgcrypt support required for RemoteOSD plugin]) ]) dnl dnl RAOP plugin dnl -AC_MSG_CHECKING([whether to enable RAOP plugin]) +AC_MSG_CHECKING([whether to enable the RAOP plugin]) AS_IF([test "${have_libgcrypt}" = "yes"], [ AC_MSG_RESULT(yes) VLC_ADD_PLUGIN([stream_out_raop]) @@ -4177,8 +4180,8 @@ AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"]) dnl dnl media library dnl -AC_ARG_ENABLE(media-library, [--enable-media-library media library (default auto)]) -if test "${enable_media_library}" != "no"; then +AC_ARG_ENABLE(media-library, [--enable-media-library media library (default disabled)]) +if test "${enable_media_library}" == "yes"; then if test "${enable_sqlite}" != "yes"; then if test "${enable_media_library}" == "yes"; then AC_MSG_ERROR([SQLite module is required for the media library]) @@ -4191,6 +4194,7 @@ if test "${enable_media_library}" != "no"; then VLC_ADD_PLUGIN([media_library]) fi fi +AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" = "yes"]) dnl dnl Endianness check @@ -4425,7 +4429,6 @@ AC_CONFIG_FILES([ modules/misc/playlist/Makefile modules/misc/osd/Makefile modules/misc/stats/Makefile - modules/misc/xml/Makefile modules/media_library/Makefile modules/mux/Makefile modules/mux/mpeg/Makefile