X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=aa2c25d6f38e67520ea2593546ca8029ea348e9e;hb=7b6d33911304c0a8171957062652ee94fa3a0cc2;hp=1fba15b7c117d0df55d172b6d59463a4bd284565;hpb=beb11b61a6d27bc616d8fa9240f2ff2bfb58e16c;p=vlc diff --git a/configure.ac b/configure.ac index 1fba15b7c1..aa2c25d6f3 100644 --- a/configure.ac +++ b/configure.ac @@ -192,7 +192,7 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") dnl dnl Gettext stuff dnl -ALL_LINGUAS="da de en_GB es fr hu it ja nl no pl pt_BR ru sv" +ALL_LINGUAS="da de en_GB es fr hu it ja nl no pl pt_BR ru sv el" AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then @@ -279,9 +279,9 @@ VLC_LIBRARY_SUFFIX case "${SYS}" in mingw32|cygwin) - VLC_ADD_CFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}]) - VLC_ADD_CXXFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}]) - VLC_ADD_OBJCFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}]) + VLC_ADD_CFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}]) + VLC_ADD_CXXFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}]) + VLC_ADD_OBJCFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}]) ;; *) VLC_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC]) @@ -297,7 +297,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd dnl Check for system libs needed need_libc=false -AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon) +AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon) dnl Check for usual libc functions AC_CHECK_FUNCS(strdup strndup atof lseek) @@ -947,7 +947,7 @@ dnl VLC_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync showintf]) VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg demuxdump]) VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak]) -VLC_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur]) +VLC_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur motiondetect]) VLC_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32 audio_format]) VLC_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler]) VLC_ADD_PLUGINS([trivial_channel_mixer simple_channel_mixer headphone_channel_mixer normvol]) @@ -1224,7 +1224,6 @@ dnl AC_ARG_WITH(,[Input plugins:]) -dnl dnl live.com input dnl AC_ARG_ENABLE(livedotcom, @@ -1305,7 +1304,7 @@ AC_ARG_ENABLE(dvdread, if test "${enable_dvdread}" != "no" then AC_ARG_WITH(dvdread, - [ --with-dvdread=PATH libdvdread headers and libraries]) + [ --with-dvdread=PATH libdvdread headers and libraries]) AC_ARG_WITH(dvdread-tree, [ --with-dvdread-tree=PATH libdvdread tree for static linking]) @@ -1531,19 +1530,19 @@ AC_ARG_ENABLE(libcdio, AC_ARG_ENABLE(libcddb, [ --enable-libcddb CDDB support for CDDAX (default enabled)]) -dnl AC_ARG_ENABLE(vcdx, -dnl [ --enable-vcdx VCD support with Navigation (default enabled)]) +AC_ARG_ENABLE(vcdx, + [ --enable-vcdx VCD support with Navigation (default disabled)]) AC_ARG_ENABLE(cdda, [ --enable-cdda CDDA plugin support (default enabled)]) AC_ARG_ENABLE(cddax, - [ --enable-cddax CDDAX plugin support (default enabled)]) + [ --enable-cddax CDDA plugin with CD Text and possibly CDDB and paranoia support (default disabled)]) -if test "${enable_cddax}" != "no" +if test "${enable_cddax}" = "yes" then PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.71, - [enable_cddax="no" + [ AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio]) VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS]) VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS]) @@ -1551,6 +1550,10 @@ then [AC_MSG_WARN(libcdio library not found) HAVE_CDDAX=no]) + PKG_CHECK_MODULES(LIBCDIO_PARANOIA, libcdio_paranoia >= 0.72, [ + VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_CDDA_LIBS $LIBCDIO_PARANOIA_LIBS])], + HAVE_CDDAX=no) + if test "$enable_libcddb" != "no"; then PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [ HAVE_LIBCDDB=yes @@ -1562,18 +1565,24 @@ then HAVE_LIBCDDB=no]) fi -dnl if test "${enable_vcdx}" != "no" -dnl then -dnl PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21, -dnl [enable_vcd="no" -dnl AC_DEFINE(HAVE_VCDX, [], -dnl [Define for the VCD plugin using libcdio/libvcdinfo]) -dnl VLC_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS]) -dnl VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) -dnl VLC_ADD_PLUGINS([vcdx])], -dnl [AC_MSG_WARN(vcdinfo library not found) -dnl HAVE_VCDX=no]) -dnl fi +fi + +if test "${enable_vcdx}" = "yes" +then + PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.71, + [VLC_ADD_LDFLAGS([vcdx],[$LIBCDIO_LIBS]) + VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])], + [AC_MSG_WARN(libcdio library not found) + HAVE_VCDX=no]) + + PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21, + [AC_DEFINE(HAVE_VCDX, [], + [Define for the VCD plugin using libcdio/libvcdinfo]) + VLC_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS]) + VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) + VLC_ADD_PLUGINS([vcdx])], + [AC_MSG_WARN(vcdinfo library not found) + HAVE_VCDX=no]) fi dnl @@ -1859,22 +1868,22 @@ then VLC_ADD_LDFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) else AC_ARG_WITH(ffmpeg-mp3lame, - [ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support], + [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support], [ VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ]) AC_ARG_WITH(ffmpeg-faac, - [ --with-ffmpeg-faac if ffmpeg has been compiled with faac support], + [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support], [ VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ]) AC_ARG_WITH(ffmpeg-dts, - [ --with-ffmpeg-dts if ffmpeg has been compiled with dts support], + [ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support], [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ]) AC_ARG_WITH(ffmpeg-zlib, - [ --with-ffmpeg-zlib if ffmpeg has been compiled with zlib support], + [ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support], [ VLC_ADD_LDFLAGS([ffmpeg],[-lz]) ]) @@ -2433,7 +2442,7 @@ then fi theora_libs="-ltheora -logg" VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[ - AC_MSG_ERROR([libtheora doesn't appear to be installed on you system. + 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]) ]) @@ -2443,7 +2452,7 @@ dnl dnl dirac decoder plugin dnl AC_ARG_ENABLE(dirac, -[ --enable-dirac experimental dirac codec (default disabled)]) +[ --enable-dirac experimental dirac codec (default disabled)]) if test "${enable_dirac}" = "yes"; then AC_CHECK_HEADERS(libdirac_decoder/dirac_parser.h, [ AC_CHECK_LIB(dirac_decoder, dirac_decoder_init, [ @@ -2478,7 +2487,7 @@ AC_ARG_ENABLE(x264, [ --enable-x264 H264 encoding support with libx264 (default enabled)]) if test "${enable_x264}" != "no"; then AC_ARG_WITH(x264-tree, - [ --with-x264-tree=PATH x264 tree for static linking ],[],[]) + [ --with-x264-tree=PATH x264 tree for static linking ],[],[]) if test "${with_x264_tree}" != "no" -a -n "${with_x264_tree}" then real_x264_tree="`cd ${with_x264_tree} 2>/dev/null && pwd`" @@ -2805,7 +2814,7 @@ dnl dnl libxml2 module dnl AC_ARG_ENABLE(libxml2, - [ --enable-libxml2 libxml2 support (default enabled)]) + [ --enable-libxml2 libxml2 support (default enabled)]) if test "${enable_libxml2}" != "no" then XML2_PATH="${PATH}" @@ -3754,6 +3763,20 @@ then fi fi +dnl +dnl DAAP access plugin and services discovery +dnl +AC_ARG_ENABLE(daap, + [ --enable-daap DAAP shares services discovery support (default enabled)]) +if test "$enable_daap" != "no" +then + PKG_CHECK_MODULES(DAAP, opendaap >= 0.3.0, + [ VLC_ADD_PLUGINS([daap]) + VLC_ADD_LDFLAGS([daap],[$DAAP_LIBS]) + VLC_ADD_CFLAGS([daap],[$DAAP_CFLAGS])]:, + [AC_MSG_WARN(DAAP library not found)]) +fi + dnl dnl Lirc plugin dnl @@ -3808,7 +3831,7 @@ dnl dnl GnuTLS-based TLS/SSL support dnl AC_ARG_WITH(libgnutls-prefix, - [ --with-libgnutls-prefix=PREFIX set prefix where libgnutls is installed], + [ --with-libgnutls-prefix=PREFIX set prefix where libgnutls is installed], libgnutls_config_prefix="$withval", libgnutls_config_prefix="") AS_IF([test x$libgnutls_config_prefix != x], @@ -3850,7 +3873,7 @@ dnl We give the user the opportunity to specify dnl --with-words=big or --with-words=little ; otherwise, try to guess dnl AC_ARG_WITH(words, - [ --with-words=endianness set endianness (big or little)]) + [ --with-words=endianness set endianness (big or little)]) case "${with_words}" in big) ac_cv_c_bigendian=yes @@ -3902,6 +3925,33 @@ then AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system) fi +dnl +dnl Microsoft ActiveX support +dnl +activex=false +AC_ARG_ENABLE(activex, + [ --enable-activex build a vlc-based ActiveX control (default enabled on Win32)]) +if test "${enable_activex}" != "no" +then + if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" + then + AC_CHECK_PROG(MIDL, midl, :) + AC_CHECK_HEADERS(ole2.h olectl.h, + [ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) + VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid]) + AC_CHECK_HEADERS(objsafe.h, + VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]) + ) + activex=: + ], + [ AC_MSG_ERROR([required OLE headers are missing from your system]) ] + ) + fi +fi +AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)]) +AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}") +AM_CONDITIONAL(BUILD_ACTIVEX,${activex}) + dnl dnl Mozilla plugin dnl @@ -4079,7 +4129,7 @@ dnl dnl Stuff used by the program dnl AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string]) -AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2004 VideoLAN", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2005 VideoLAN", [Copyright string]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`" @@ -4132,6 +4182,7 @@ VLC_OUTPUT_VLC_CONFIG_IN AC_CONFIG_FILES([ Makefile + activex/Makefile debian/Makefile doc/Makefile intl/Makefile