echo " Assuming --enable-twolame"
enable_realrtsp="yes"
echo " Assuming --enable-realrtsp"
+ enable_update_check="yes"
+ echo " Assuming --enable-update-check"
enable_skins2="no"
echo " Assuming --disable-skins2"
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 vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua],[-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 vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd],[-lws2_32])
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
VLC_ADD_CPPFLAGS([libvlc vlc],[-Dmain(a,b)=maince(a,b)])
VLC_ADD_LDFLAGS([libvlc vlc],[-e WinMainCRTStartup])
- VLC_ADD_LIBS([libvlc access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp sap http netsync audioscrobbler growl rtp stream_out_rtp],[-lws2])
+ VLC_ADD_LIBS([libvlc 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([libvlc],[-lmmtimer])
fi
;;
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],[-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],[-lsocket])
])
])
VLC_ADD_PLUGIN([m4v])
VLC_ADD_PLUGIN([m4a])
VLC_ADD_PLUGIN([h264])
-VLC_ADD_PLUGIN([vc1])
-VLC_ADD_PLUGIN([demux_cdg])
VLC_ADD_PLUGIN([cdg])
VLC_ADD_PLUGIN([ps])
-VLC_ADD_PLUGIN([pva])
VLC_ADD_PLUGIN([avi])
VLC_ADD_PLUGIN([asf])
VLC_ADD_PLUGIN([mp4])
-VLC_ADD_PLUGIN([rawdv])
-VLC_ADD_PLUGIN([rawvid])
-VLC_ADD_PLUGIN([nsv])
-VLC_ADD_PLUGIN([real])
-VLC_ADD_PLUGIN([aiff])
-VLC_ADD_PLUGIN([mjpeg])
-VLC_ADD_PLUGIN([wav])
-VLC_ADD_PLUGIN([voc])
-VLC_ADD_PLUGIN([smf])
-VLC_ADD_PLUGIN([demuxdump])
-VLC_ADD_PLUGIN([flacsys])
-VLC_ADD_PLUGIN([tta])
-VLC_ADD_PLUGIN([subtitle])
-VLC_ADD_PLUGIN([vobsub])
-VLC_ADD_PLUGIN([a52sys])
-VLC_ADD_PLUGIN([dtssys])
-VLC_ADD_PLUGIN([au])
-VLC_ADD_PLUGIN([ty])
-VLC_ADD_PLUGIN([xa])
-VLC_ADD_PLUGIN([nuv])
dnl Text codecs:
VLC_ADD_PLUGIN([cvdsub])
VLC_ADD_PLUGIN([svcdsub])
[ --enable-postproc libpostproc image post-processing (default enabled)])
if test "${enable_postproc}" != "no"
then
- PKG_CHECK_MODULES(POSTPROC,[libpostproc],
+ PKG_CHECK_MODULES(POSTPROC,[libpostproc libavutil],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
[ VLC_ADD_PLUGIN([pulse])
VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])
VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])],
- [AC_MSG_WARN(pulsaudio library not found)])
+ [AC_MSG_WARN(pulseaudio library not found)])
fi
dnl
fi])
dnl
-dnl aRts module -- broken (freeze wxWidgets)
+dnl aRts module
+dnl broken? (froze wxWidgets back then)
dnl
AC_ARG_ENABLE(arts,
[ --enable-arts aRts sound server (default disabled)],
fi
AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"])
-dnl
-dnl wxWidgets module
-dnl
-AC_ARG_ENABLE(wxwidgets,
- [ --enable-wxwidgets wxWidgets support (default disabled)])
-
-if test "${enable_wxwidgets}" = "yes"
-then
- AC_MSG_WARN([wxWidgets support is deprecated and will be removed. Consider using Qt4 instead.])
- WXWIDGETS_PATH="${PATH}"
- AC_ARG_WITH(wx-config-path,
- [ --with-wx-config-path=PATH wx-config path (default search in \$PATH)],
- [ if test "${with_wx_config_path}" != "no"
- then
- WXWIDGETS_PATH="${with_wx_config_path}:${PATH}"
- fi ])
- WXWIDGETS_NAME="wx-config"
- AC_ARG_WITH(wx-config,
- [ --with-wx-config=NAME wx-config name (default is wx-config)],
- [ if test "${with_wx_config}" != "no"
- then
- WXWIDGETS_NAME="${with_wx_config}"
- fi ])
- # look for wx-config
- AC_PATH_PROG(WX_CONFIG, ${WXWIDGETS_NAME}, no, ${WXWIDGETS_PATH})
- if test "${WX_CONFIG}" != "no" -a "${CXX}" != ""
- then
- if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null
- then
- AC_MSG_ERROR([You need wxWidgets version 2.6.0 or upwards. Please upgrade and try again.])
- fi
- AC_LANG_PUSH(C++)
- # Turn this error:
- # playlist.cpp:1351: error: ISO C++ forbids cast to non-reference type
- # into a warning. However better would be to fix playlist.cpp
- AC_CACHE_CHECK([if \$CXX accepts -fpermissive],
- [ac_cv_cxx_fpermissive],
- [CXXFLAGS="${CXXFLAGS_save} -fpermissive"
- AC_TRY_COMPILE([],,ac_cv_cxx_fpermissive=yes,
- ac_cv_cxx_fpermissive=no)])
- if test "${ac_cv_cxx_fpermissive}" = "yes"; then
- VLC_ADD_CXXFLAGS([wxwidgets],-fpermissive)
- fi
- VLC_ADD_LIBS([wxwidgets],[`${WX_CONFIG} --libs`])
- VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`])
- # check if we must link against gtk2 libs
- # if __WXGTK20__ && __WXGTK__ are defined
- # for modules/gui/wxwidgets/video.cpp
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#include <wx/wx.h>
-#ifdef __WXGTK20__
-#error ok, we need to link against gtk2
-#endif
- ])],[WXGTK=no],[WXGTK=yes])
- if test "$WXGTK" = "yes"; then
- ${PKG_CONFIG} --exists gtk+-2.0 && VLC_ADD_LIBS([wxwidgets],[`$PKG_CONFIG --libs gtk+-2.0`])
- fi
- if ${WX_CONFIG} --unicode
- then
- # wxwidgets should provide the following flags but does not
- # the following is required to compile for win32
- VLC_ADD_CXXFLAGS([wxwidgets],[-D_UNICODE -DUNICODE])
- else
- AC_MSG_ERROR([You need a unicode build of wxWidgets. Please fix that and try again. Better yet, you can configure with --disable-wxwidgets.])
- fi
- if test "$have_libcdio" = "yes"
- then
- VLC_ADD_LIBS([wxwidgets],[$LIBCDIO_LIBS])
- VLC_ADD_CXXFLAGS([wxwidgets],[$LIBCDIO_CFLAGS])
- else
- AC_MSG_WARN([Probe disc disabled because ok libcdio library not found])
- fi
-
- if test "$have_libvcdinfo" = "yes"
- then
- VLC_ADD_LIBS([wxwidgets],[$VCDINFO_LIBS])
- VLC_ADD_CXXFLAGS([wxwidgets],[$VCDINFO_CFLAGS])
- else
- AC_MSG_WARN([VCD information on Probe disc disabled because ok libvcdinfo not found])
- fi
-
- # now look for the wxprec.h header
- CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_wxwidgets}"
- ac_cv_wx_headers=yes
- AC_CHECK_HEADERS(wx/wxprec.h, , [
- ac_cv_wx_headers=no
- echo "Cannot find wxWidgets development headers."
- ])
- if test "${ac_cv_wx_headers}" = "yes"
- then
- VLC_ADD_PLUGIN([wxwidgets])
- AC_DEFINE([HAVE_WX], 1, [Define to 1 if you have WxWidgets library.])
- ALIASES="${ALIASES} wxvlc"
- fi
- CPPFLAGS="${CPPFLAGS_save}"
- AC_LANG_POP(C++)
- fi
- dnl WxWidgets plugin will yield incorrect code without this
- VLC_ADD_CXXFLAGS([wxwidgets], [-fno-strict-aliasing])
-fi
-
dnl
dnl QT 4
dnl
-enableqt4=false
AC_ARG_ENABLE(qt4,
- [ --enable-qt4 QT 4 support (default enabled) ])
-AS_IF([test "${enable_qt4}" != "no" &&
- (test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [
- PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.0],
- [ VLC_ADD_PLUGIN([qt4])
- AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
- ALIASES="${ALIASES} qvlc"
- enableqt4=true
- if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"; then
- VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
- else
- VLC_ADD_LIBS([qt4],[$QT4_LIBS])
- fi
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"])
- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
- AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
- ],
- AS_IF([test "${enable_qt4}" = "yes"],[
- AC_MSG_ERROR(QT4 library not found)
- ],[
- AC_MSG_WARN(QT4 library not found)
- ])
- )
+ [ --enable-qt4 QT 4 support (default enabled) ],, [
+ AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
])
-AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true")
+AS_IF([test "${enable_qt4}" != "no"], [
+ PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.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_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"])
+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ ], [
+ AS_IF([test "${enable_qt4}" = "yes"],[
+ AC_MSG_ERROR([Qt 4 library not found])
+ ],[
+ AC_MSG_WARN([Qt 4 library not found])
+ ])
+ enable_qt4="no"
+ ])
+])
+AM_CONDITIONAL(ENABLE_QT4, [test "x$enable_qt4" != "xno"])
dnl
dnl WinCE GUI module
dnl
dnl Simple test for skins2 dependency
dnl
-if test "${enable_skins2}" != "no"
-then
- if test "${WX_CONFIG}" = "no"
- then
- AC_MSG_ERROR([The skins2 module depends on the wxWidgets development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the wxWidgets development package or alternatively you can also configure with: --disable-wxwidgets --disable-skins2.])
- fi
-fi
+AS_IF([test "${enable_skins2}" != "no" && test "x$enable_qt4" = "xno"], [
+ AC_MSG_ERROR([The skins2 module depends on a the Qt4 development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt4 development package or alternatively you can also configure with: --disable-qt4 --disable-skins2.])
+])
dnl
dnl Opie QT embedded module
dnl
AC_ARG_ENABLE(libgcrypt,
[ --enable-libgcrypt libgcrypts support (default enabled)])
-
-GCRYPT_PATH="${PATH}"
-AC_ARG_WITH(libgcrypt-config-path,
-[ --with-libgcrypt-config-path=PATH libgcrypt-config path (default search in \$PATH)],
- [ if test "${with_libgcrypt_config_path}" != "no"
- then
- GCRYPT_PATH="${with_libgcrypt_config_path}:${PATH}"
- fi ])
-
-if test "${enable_libgcrypt}" != "no"
-then
- dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect
- dnl it and looks for libgcrypt headers in the wrong place.
- if test "${host_cpu}" = "${build_cpu}"
- then
- AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
- else
- AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no")
- fi
+AS_IF([test "${enable_libgcrypt}" != "no"], [
+ AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
+])
+if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
+ AS_IF([test "${have_libgcrypt}" = "yes"],[
+ VLC_ADD_LIBS([rtp], [${LIBGCRYPT_LIBS}])
+ ])
fi
AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
-AS_IF([test "${have_libgcrypt}" = "yes"],[
- # look for libgcrypt-config
- AC_PATH_PROG(GCRYPT_CONFIG, "libgcrypt-config", no, ${GCRYPT_PATH})
- GCRYPT_CFLAGS=`${GCRYPT_CONFIG} --cflags`
- GCRYPT_LIBS=`${GCRYPT_CONFIG} --libs`
-])
dnl
dnl TLS/SSL
VLC_ADD_LIBS([gnutls], [-lz])
VLC_ADD_LIBS([gnutls], [${LTLIBINTL}])
])
+ dnl The GnuTLS plugin invokes gcry_control directly.
AS_IF([test "${have_libgcrypt}" = "yes"],[
- VLC_ADD_LIBS([gnutls], ${GCRYPT_LIBS})
- VLC_ADD_CFLAGS([gnutls], ${GCRYPT_CFLAGS})
- ], [-lgpg-error])
+ VLC_ADD_LIBS([gnutls], [${LIBGCRYPT_LIBS}])
+ VLC_ADD_CFLAGS([gnutls], [${LIBGCRYPT_CFLAGS}])
+ ])
VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
])
])
+
+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], ${LIBGCRYPT_LIBS})
+ VLC_ADD_CFLAGS([remoteosd], ${LIBGCRYPT_CFLAGS})
+ ], [
+ AC_MSG_ERROR([libgcrypt support required for RemoteOSD plugin])
+ ])
+])
+
+
dnl
dnl update checking system
dnl
then
AC_MSG_ERROR([libgcrypt is required for update checking system])
fi
- VLC_ADD_LIBS([libvlc], ${GCRYPT_LIBS})
- VLC_ADD_CFLAGS([libvlc], ${GCRYPT_CFLAGS})
+ VLC_ADD_LIBS([libvlc], [${LIBGCRYPT_LIBS}])
+ VLC_ADD_CFLAGS([libvlc], [${LIBGCRYPT_CFLAGS}])
AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism])
fi
then
dnl New firefox-1.5 SDK api
PKG_CHECK_MODULES([FIREFOX], [firefox-plugin],
- [],
[
PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom],
[],
modules/audio_mixer/Makefile
modules/audio_output/Makefile
modules/codec/Makefile
+ modules/codec/avcodec/Makefile
modules/codec/cmml/Makefile
modules/codec/dmo/Makefile
- modules/codec/ffmpeg/Makefile
modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
modules/codec/xvmc/Makefile
modules/control/http/Makefile
modules/demux/Makefile
modules/demux/asf/Makefile
+ modules/demux/avformat/Makefile
modules/demux/avi/Makefile
modules/demux/mp4/Makefile
modules/demux/mpeg/Makefile
modules/gui/qnx/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
- modules/gui/wxwidgets/Makefile
modules/gui/wince/Makefile
modules/meta_engine/Makefile
modules/misc/Makefile
modules/misc/probe/Makefile
modules/mux/Makefile
modules/mux/mpeg/Makefile
- modules/mux/rtp/Makefile
modules/packetizer/Makefile
modules/services_discovery/Makefile
modules/stream_out/Makefile
projects / vlc / blobdiff