X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=8e3690398ec4fd81c9a753bb53f4feead2cb9221;hb=d17f1609d78d3763fa15f2ad21140d853d07a136;hp=998fe53cbb6c7084e5dd895a41fc5c43f914dad3;hpb=325ad139c4ce8fc62616c7ea433c096cc2a2276b;p=vlc diff --git a/configure.ac b/configure.ac index 998fe53cbb..8e3690398e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team]) +AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team]) AC_INIT(vlc, 1.1.0-git) VERSION_MAJOR="1" @@ -11,8 +11,8 @@ PKGDIR="vlc" AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" -CODENAME="Yellow Bastard" -COPYRIGHT_YEARS="1996-2009" +CODENAME="The Luggage" +COPYRIGHT_YEARS="1996-2010" AC_PREREQ(2.59c) AC_CONFIG_SRCDIR(src/libvlc.c) @@ -125,20 +125,17 @@ AC_ARG_WITH(contrib, if test "`echo \"$topdir\" | cut -c 1`" != "/"; then topdir="`pwd`/$topdir" fi - CONTRIB_DIR=${topdir}/extras/contrib + CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host} + if ! test -d "$CONTRIB_DIR" + then + gccmachine=`$CC -dumpmachine` + CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine} + fi fi AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}]) AS_IF([test -d ${CONTRIB_DIR}/lib],[ - AS_IF([test "`grep HOST ${CONTRIB_DIR}/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"],[ - if test "${with_contrib}" = "yes"; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host]) - else - AC_MSG_RESULT([no]) - AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host]) - fi - ],[ AC_MSG_RESULT([yes]) + AC_SUBST(CONTRIB_DIR) export PATH=${CONTRIB_DIR}/bin:$PATH CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include" @@ -170,10 +167,9 @@ AC_ARG_WITH(contrib, export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES fi + ],[ + AC_MSG_RESULT([no]) ]) - ],[ - AC_MSG_RESULT([no]) - ]) ]) dnl dnl Set default values @@ -193,7 +189,7 @@ case "${host_os}" in bsdi*) SYS=bsdi CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" - VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd]) + VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx],[-ldvd]) ;; *bsd*) SYS="${host_os}" @@ -223,7 +219,7 @@ case "${host_os}" in 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([avcodec avformat swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress]) + 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]) @@ -250,8 +246,6 @@ case "${host_os}" in echo " Assuming --enable-theora" enable_shout="yes" echo " Assuming --enable-shout" - enable_cddax="yes" - echo " Assuming --enable-cddax" enable_vcdx="yes" echo " Assuming --enable-vcdx" enable_caca="yes" @@ -269,14 +263,8 @@ case "${host_os}" in enable_skins2="no" echo " Assuming --disable-skins2" - enable_x11="no" - echo " Assuming --disable-x11" enable_xcb="no" echo " Assuming --disable-xcb" - enable_glx="no" - echo " Assuming --disable-glx" - enable_xvideo="no" - echo " Assuming --disable-xvideo" fi dnl dnl Check for Mac OS X SDK settings @@ -358,8 +346,8 @@ case "${host_os}" in VLC_ADD_LIBS([libvlccore],[-lws2_32 -lnetapi32 -lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([activex mozilla],[-lgdi32]) - VLC_ADD_LIBS([cdda vcdx cddax 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 http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[-lws2_32]) + 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_file], [-lshlwapi]) dnl dnl DEP and ASLR options @@ -373,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 http netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts telnet 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],[-lws2]) VLC_ADD_LIBS([libvlccore],[-lmmtimer]) fi ;; @@ -398,9 +386,9 @@ case "${host_os}" in LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}" dnl Check for BONE if test -f /boot/beos/system/lib/libbind.so; then - VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lbind -lsocket]) + VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lbind -lsocket]) else - VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lnet]) + VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet]) fi dnl Ugly check for Zeta @@ -580,7 +568,7 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale]) +AC_CHECK_FUNCS([gettimeofday isatty getpwuid_r memalign posix_memalign getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale]) AC_CHECK_FUNCS(fcntl) 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 vasprintf swab tdestroy]) AC_CHECK_FUNCS([stricmp strnicmp]) @@ -614,7 +602,7 @@ fi SOCKET_LIBS="" AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ - VLC_ADD_LIBS([libvlccore cdda cddax],-lsocket) + VLC_ADD_LIBS([libvlccore cdda],-lsocket) SOCKET_LIBS="-lsocket" ]) ]) @@ -736,10 +724,10 @@ 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 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 realaudio realvideo opengl],[-lm]) ]) AC_CHECK_LIB(m,sqrt,[ - VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract],[-lm]) + VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm]) ]) AC_CHECK_LIB(m,ceil,[ VLC_ADD_LIBS([access_imem hotkeys mosaic swscale_omap],[-lm]) @@ -1015,9 +1003,6 @@ fi ;; esac -dnl build the qte plugin ? -NEED_QTE_MAIN=no - dnl Check for ntohl, etc. AC_CACHE_CHECK([for ntohl in sys/param.h], [ac_cv_c_ntohl_sys_param_h], @@ -1213,6 +1198,7 @@ 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]) @@ -1245,7 +1231,7 @@ AC_LANG_POP(C++) if test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([gestures]) - VLC_ADD_PLUGIN([rc]) + VLC_ADD_PLUGIN([oldrc]) VLC_ADD_PLUGIN([hotkeys]) VLC_ADD_PLUGIN([showintf]) VLC_ADD_PLUGIN([marq]) @@ -1315,7 +1301,6 @@ dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - VLC_ADD_PLUGIN([screensaver]) VLC_ADD_PLUGIN([motion]) VLC_ADD_PLUGIN([dynamicoverlay]) VLC_ADD_PLUGIN([signals]) @@ -1807,6 +1792,8 @@ then if test "x${have_lua}" = "xyes" ; then VLC_ADD_LIBS([lua],[$LUA_LIBS]) VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS]) + else + AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.]) fi fi AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"]) @@ -1818,7 +1805,7 @@ AC_ARG_ENABLE(httpd, [ --enable-httpd HTTP daemon (default enabled)]) if test "${enable_httpd}" != "no" then - VLC_ADD_PLUGIN([http]) + VLC_ADD_PLUGIN([oldhttp]) AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support) fi AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"]) @@ -1852,7 +1839,7 @@ AS_IF([test "${enable_vlm}" != "no"], [ AC_MSG_ERROR([VLM requires the stream output. Do not use --disable-sout.]) ]) AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support]) - VLC_ADD_PLUGIN([telnet]) + VLC_ADD_PLUGIN([oldtelnet]) ]) AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"]) @@ -1867,6 +1854,7 @@ AS_IF([test "${enable_growl}" != "no"], [ AC_CHECK_HEADERS(Growl/GrowlDefines.h, [ VLC_ADD_PLUGIN([growl]) VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit]) + VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) ]) ] ) @@ -2499,44 +2487,8 @@ then fi dnl -dnl VCDX and CDDAX modules +dnl VCDX modules dnl -AC_ARG_ENABLE(cddax, - AS_HELP_STRING([--enable-cddax],[audio CD plugin with CD Text and CD paranoia - via libcdio (default disabled)])) - -AC_ARG_ENABLE(libcddb, - [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)]) - -if test "${enable_cddax}" = "yes" -then - if test "$have_libcdio" = "yes" - then - AC_DEFINE(HAVE_CDDAX, 1, [Define for the audio CD plugin using libcdio]) - VLC_ADD_LIBS([cddax],[$LIBCDIO_LIBS]) - VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS]) - VLC_ADD_PLUGIN([cddax]) - PKG_CHECK_MODULES(LIBCDIO_PARANOIA, libcdio_paranoia >= 0.72, [ - VLC_ADD_LIBS([cddax],[$LIBCDIO_CDDA_LIBS $LIBCDIO_CDDA_LIBS $LIBCDIO_PARANOIA_LIBS])], - AC_MSG_WARN([CD Paranoia support disabled because no libcdio >= 0.72 found])) - else - AC_MSG_WARN([cddax plugin disabled because ok libcdio library not found or disabled]) - HAVE_CDDAX=no - fi - - if test "$enable_libcddb" != "no"; then - PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [ - HAVE_LIBCDDB=yes - AC_DEFINE(HAVE_LIBCDDB, 1, [Define this if you have libcddb installed]) - VLC_ADD_LIBS([cddax],[$LIBCDDB_LIBS]) - VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS]) - ], - [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) - HAVE_LIBCDDB=no]) - fi - -fi - AC_ARG_ENABLE(vcdx, [ --enable-vcdx VCD with navigation via libvcdinfo (default disabled)]) @@ -2579,6 +2531,9 @@ AC_ARG_ENABLE(cdda, AC_ARG_ENABLE(vcd, [ --enable-vcd built-in VCD (default enabled)]) +AC_ARG_ENABLE(libcddb, + [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)]) + if test "${enable_vcd}" != "no" then AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h) @@ -2620,8 +2575,8 @@ then then VLC_ADD_PLUGIN([vcd]) VLC_ADD_PLUGIN([cdda]) - VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-Wl,-framework,IOKit,-framework,CoreFoundation]) - VLC_ADD_LIBS([vcdx cddax cdda],[-liconv]) + VLC_ADD_LDFLAGS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LIBS([vcdx cdda],[-liconv]) fi if test "$enable_libcddb" != "no"; then @@ -2687,7 +2642,7 @@ if test "${enable_screen}" != "no"; then fi dnl -dnl ipv6 plugin - not for QNX yet +dnl ipv6 plugin dnl have_ipv6=no AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[ @@ -3049,6 +3004,10 @@ then 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_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS]) VLC_ADD_CFLAGS([avcodec],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS]) @@ -3544,16 +3503,6 @@ AS_IF( [test "${enable_asademux}" = "yes"], [ ]) ]) -dnl -dnl CMML plugin -dnl -AC_ARG_ENABLE(cmml, - [ --enable-cmml CMML support (default enabled)]) -if test "${enable_cmml}" != "no" -then - VLC_ADD_PLUGIN([cmml]) -fi - dnl dnl kate decoder plugin dnl @@ -3613,66 +3562,13 @@ dnl Xlib dnl AC_PATH_XTRA() -AC_ARG_ENABLE(x11, - [ --enable-x11 X11 support with Xlib (default enabled)],, [ - AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ - enable_x11="yes" - ], [ - enable_x11="no" - ]) -]) - -CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" - -AS_IF([test "${enable_x11}" != "no"], [ - AC_CHECK_HEADERS(X11/Xlib.h) - -dnl Check for DPMS - AC_CHECK_HEADERS(X11/extensions/dpms.h, [ - AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h) - AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(DPMSINFO_IN_DPMS_H, 1, - Define if defines DPMSInfo.) - ],[ - AC_MSG_RESULT(no) - ]) - ],,[ - #include - ]) -]) - -dnl -dnl GLX module -dnl (enabled by default except on win32) -dnl -AC_ARG_ENABLE(glx, - [ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [ - enable_glx="$enable_x11" -]) -AS_IF([test "${enable_glx}" != "no"], [ - AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h) - AC_COMPILE_IFELSE(AC_LANG_PROGRAM( - [[#if !defined(HAVE_X11_XLIB_H) || !defined(HAVE_GL_GLU_H) || !defined(HAVE_GL_GLX_H) - choke me - #endif]]), - [ - VLC_ADD_PLUGIN([glx]) - VLC_ADD_LIBS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU]) - VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}]) - ],[AC_MSG_ERROR([Please install GL development package. Alternatively you can also configure with --disable-glx.])]) -]) - -dnl End of Xlib tests -CPPFLAGS="${CPPFLAGS_save}" - dnl dnl X C Bindings modules dnl AC_ARG_ENABLE(xcb, [ --enable-xcb X11 support with XCB (default enabled)],, [ - AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [ enable_xcb="yes" ], [ enable_xcb="no" @@ -3688,6 +3584,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]) @@ -3739,10 +3636,18 @@ AC_ARG_ENABLE(glx, ]) AS_IF([test "${enable_glx}" != "no"], [ PKG_CHECK_MODULES(XLIB_XCB, [x11-xcb]) - PKG_CHECK_MODULES(GLU, [glu]) - + PKG_CHECK_MODULES(GL, [gl],, [ + AC_CHECK_HEADER([GL/gl.h], [ + GL_CFLAGS="" + GL_LIBS="-lGL" + ], [ + AC_MSG_ERROR([GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx.]) + ]) + ]) VLC_ADD_PLUGIN([xcb_glx]) ]) +AC_SUBST([GL_CFLAGS]) +AC_SUBST([GL_LIBS]) dnl @@ -3752,21 +3657,10 @@ dnl AC_ARG_ENABLE(opengl, [ --enable-opengl OpenGL support (default enabled)]) if test "${enable_opengl}" != "no" && - test "${SYS}" != "beos" -a "${SYS}" != "mingwce"; then - if test "${SYS}" != "darwin"; then - AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ - VLC_ADD_PLUGIN([opengl]) - if test "${SYS}" != "mingw32"; then - VLC_ADD_LIBS([opengl],[${X_LIBS} -lGL -lGLU]) - else - VLC_ADD_LIBS([opengl],[-lopengl32 -lglu32]) - fi - ]) - else + test "${SYS}" = "darwin"; then dnl OS X special case (no GL/gl.h but OpenGL/gl.h) VLC_ADD_PLUGIN([opengl]) VLC_ADD_LIBS([opengl],[-Wl,-framework,OpenGL]) - fi fi dnl @@ -3891,33 +3785,6 @@ then VLC_ADD_PLUGIN([snapshot]) fi -dnl -dnl Qt Embedded module -dnl (disabled by default) -dnl -AC_ARG_ENABLE(qte, - [ --enable-qte QT Embedded support (default disabled)]) -if test "${enable_qte}" = "yes" -then - AC_ARG_WITH(qte, - [ --with-qte=PATH Qt Embedded headers and libraries]) - if test "${with_qte}" != "no" -a -n "${with_qte}" - then - VLC_ADD_LIBS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) - else - VLC_ADD_LIBS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) - fi - VLC_ADD_PLUGIN([qte]) - NEED_QTE_MAIN=yes - CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}" - AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ - AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) - ] ) - CPPFLAGS="${CPPFLAGS_save}" -fi - dnl dnl Roku HD1000 Video output module dnl @@ -4215,8 +4082,8 @@ dnl CoreAudio plugin dnl AC_ARG_ENABLE(macosx-audio, [ --enable-macosx-audio Mac OS X audio module (default enabled on MacOS X)]) -if test "${enable_macosx-audio}" != "no" && - (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes") +if test "x${enable_macosx_audio}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes") then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, [ VLC_ADD_PLUGIN([auhal]) @@ -4440,26 +4307,6 @@ AS_IF([test "${enable_qt4}" != "no"], [ ]) AM_CONDITIONAL(ENABLE_QT4, [test "x$enable_qt4" != "xno"]) -dnl -dnl WinCE GUI module -dnl -AC_ARG_ENABLE(wince, - [ --enable-wince Windows CE interface (default enabled with MinGW)]) -if test "${enable_wince}" != "no"; then - if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGIN([wince]) - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) - dnl Gross hack - VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) - elif test "${SYS}" = "mingw32"; then - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) - dnl Gross hack - VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) - fi -fi - dnl dnl Simple test for skins2 dependency dnl @@ -4467,84 +4314,80 @@ 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(opie, - [ --enable-opie Qt embedded interface support (default disabled)], - [if test "${enable_opie}" = "yes"; then - AC_ARG_WITH(qte, - [ --with-qte=PATH Qt Embedded headers and libraries]) - if test "${with_qte}" != "no" -a -n "${with_qte}" - then - VLC_ADD_LIBS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) - else - VLC_ADD_LIBS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`]) - VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`]) - fi - CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}" - AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ - AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) - ] ) - CPPFLAGS="${CPPFLAGS_save}" - - VLC_ADD_PLUGIN([opie]) - NEED_QTE_MAIN=yes - VLC_ADD_LIBS([opie],[-lqpe ${LDFLAGS_qte}]) - VLC_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}]) - if test "${with_qte}" != "no" -a -n "${with_qte}" - then - MOC=${with_qte}/bin/moc - else - MOC=${QTDIR}/bin/moc - fi - fi]) - dnl dnl MacOS X video output/gui modules dnl AC_ARG_ENABLE(macosx, - [ --enable-macosx MacOS X support (default enabled on MacOS X)]) + [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) if test "x${enable_macosx}" = "xyes" then - VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) - VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa]) - VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL]) + VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,Cocoa]) + VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,OpenGL]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) - VLC_ADD_LDFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle -Wl,-framework,Sparkle]) - VLC_ADD_OBJCFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle]) + VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) + VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) dnl For bug report VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) - VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) - VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] ) + VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] ) - VLC_ADD_PLUGIN([access_eyetv]) - VLC_ADD_PLUGIN([qtcapture]) VLC_ADD_PLUGIN([macosx]) VLC_ADD_PLUGIN([minimal_macosx]) - VLC_ADD_PLUGIN([opengllayer]) fi dnl -dnl QNX RTOS module +dnl MacOS X related modules dnl -AC_ARG_ENABLE(qnx, - [ --enable-qnx QNX RTOS support (default enabled on QNX RTOS)]) - if test "${enable_qnx}" != "no" - then - AC_CHECK_HEADERS(Ph.h, [ - VLC_ADD_PLUGIN([qnx]) - VLC_ADD_LIBS([qnx],[-lasound -lph]) - ]) - fi + +AC_ARG_ENABLE(macosx-vout, + [ --enable-macosx-vout Mac OS X video output module (default enabled on Mac OS X)]) +if test "x${enable_macosx_vout}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes") +then + VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,Cocoa]) + VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,OpenGL]) + VLC_ADD_PLUGIN([vout_macosx]) +fi + +AC_ARG_ENABLE(macosx-dialog-provider, + [ --enable-macosx-dialog-provider Mac OS X dialog module (default enabled on Mac OS X)]) +if test "x${enable_macosx_dialog_provider}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes") +then + VLC_ADD_LDFLAGS([macosx_dialog_provider],[-Wl,-framework,Cocoa]) + VLC_ADD_PLUGIN([macosx_dialog_provider]) +fi + +AC_ARG_ENABLE(macosx-qtcapture, + [ --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)]) +if test "x${enable_macosx_qtcapture}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes") +then + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,Cocoa]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QuartzCore]) + VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) + VLC_ADD_PLUGIN([qtcapture]) +fi + +AC_ARG_ENABLE(macosx-eyetv, + [ --enable-macosx-eyetv Mac OS X EyeTV (TNT Tuner) module (default enabled on Mac OS X)]) +if test "x${enable_macosx_eyetv}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes") +then + VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) + VLC_ADD_PLUGIN([access_eyetv]) +fi + +AC_ARG_ENABLE(macosx-vlc-app, + [ --enable-macosx-vlc-app build the VLC media player (default enabled on Mac OS X)]) +AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" && + (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ]) + dnl dnl ncurses module @@ -4721,6 +4564,12 @@ dnl AC_ARG_ENABLE(gnutls, [ --enable-gnutls gnutls TLS/SSL support (default enabled)]) +AS_IF([test "${have_libgcrypt}" != "yes"], [ + AS_IF([test "${enable_gnutls}" = "yes"], [ + AC_MSG_ERROR([--enable-gnutls and --disable-libgcrypt are mutually exclusive.]) + ]) + enable_gnutls="no" +]) AS_IF([test "${enable_gnutls}" != "no"], [ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.7.4], [ VLC_ADD_PLUGIN([gnutls]) @@ -5118,17 +4967,6 @@ then VLC_ADD_PLUGIN([test4]) fi -dnl -dnl qte_main plugin -dnl -if test "${NEED_QTE_MAIN}" != "no" -then - VLC_ADD_PLUGIN([qte_main]) - VLC_ADD_CXXFLAGS([opie qte qt_video],[-DNEED_QTE_MAIN]) - VLC_ADD_CXXFLAGS([qte_main],[${CXXFLAGS_qte} ${CXXFLAGS_qt_video}]) - VLC_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}]) -fi - dnl dnl Plugin and builtin checks dnl @@ -5271,7 +5109,6 @@ AC_CONFIG_FILES([ modules/access/dshow/Makefile modules/access/dvb/Makefile modules/access/mms/Makefile - modules/access/cdda/Makefile modules/access/rtp/Makefile modules/access/rtsp/Makefile modules/access/vcd/Makefile @@ -5288,7 +5125,6 @@ AC_CONFIG_FILES([ modules/audio_output/Makefile modules/codec/Makefile modules/codec/avcodec/Makefile - modules/codec/cmml/Makefile modules/codec/dmo/Makefile modules/codec/shine/Makefile modules/codec/subtitles/Makefile @@ -5310,10 +5146,9 @@ AC_CONFIG_FILES([ modules/gui/macosx/Makefile modules/gui/hildon/Makefile modules/gui/minimal_macosx/Makefile - modules/gui/qnx/Makefile + modules/gui/macosx_dialog_provider/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile - modules/gui/wince/Makefile modules/meta_engine/Makefile modules/misc/Makefile modules/misc/dummy/Makefile @@ -5337,8 +5172,6 @@ AC_CONFIG_FILES([ modules/video_filter/dynamicoverlay/Makefile modules/video_output/Makefile modules/video_output/msw/Makefile - modules/video_output/qte/Makefile - modules/video_output/x11/Makefile modules/visualization/Makefile modules/visualization/visual/Makefile ])