X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=f8a6af85c55417817d7447feeb11ec7e7bc13331;hb=c56944cb424251d51504629cc40aebfa57f603a9;hp=a15c4d01f218410b4ca5ab7f782675c29acdfc95;hpb=b4b78fb654267cef2437c0577cbdf0d1ab050c2d;p=vlc diff --git a/configure.ac b/configure.ac index a15c4d01f2..f8a6af85c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Autoconf settings for vlc dnl $Id$ - -AC_INIT(vlc,0.7.2-cvs) + +AC_INIT(vlc,0.7.3-svn) CONFIGURE_LINE="$0 $*" CODENAME="Bond" @@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM dnl XXX: we don't put any flags here, because automake 1.5 doesn't support dnl them. And we need the comma otherwize automake will choke on it. -AM_INIT_AUTOMAKE(vlc,0.7.2-cvs) +AM_INIT_AUTOMAKE(vlc,0.7.3-svn) AM_CONFIG_HEADER(config.h) dnl @@ -53,6 +53,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(LD, ld, :) +AC_CHECK_TOOL(UPX, upx, "") dnl Sam, if you think I didn't see that... --Meuuh dnl AM_PROG_LIBTOOL @@ -146,7 +147,8 @@ case "${target_os}" in # add ws2_32 for closesocket, select, recv CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}" AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) - AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet],[-lws2_32]) + AX_ADD_LDFLAGS([vcdx cddax],[-lwinmm]) + AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet netsync],[-lws2_32]) fi ;; *nto*) @@ -286,7 +288,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 isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r) +AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf) dnl Check for usual libc functions AC_CHECK_FUNCS(strdup strndup atof lseek) @@ -567,11 +569,11 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ AC_MSG_RESULT(no)]) dnl Check for headers -AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h) +AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h) AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h) AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h) if test "${SYS}" != "mingw32"; then -AC_CHECK_HEADERS(machine/param.h sys/shm.h) +AC_CHECK_HEADERS(machine/param.h sys/shm.h altivec.h) AC_CHECK_HEADERS(linux/version.h) fi # end "${SYS}" != "mingw32" @@ -707,11 +709,19 @@ if test "${ac_cv_c_pipe}" != "no"; then fi dnl Check for various optimization flags +AC_CACHE_CHECK([if \$CC accepts -Os], + [ac_cv_c_os], + [CFLAGS="${CFLAGS_save} -Os" + AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)]) +if test "${ac_cv_c_os}" != "no" -a "${target_cpu}" = "mipsel"; then + CFLAGS_OPTIM="${CFLAGS_OPTIM} -Os" +fi + AC_CACHE_CHECK([if \$CC accepts -O3], [ac_cv_c_o3], [CFLAGS="${CFLAGS_save} -O3" AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) -if test "${ac_cv_c_o3}" != "no"; then +if test "${ac_cv_c_o3}" != "no" -a "${target_cpu}" != "mipsel"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" fi @@ -719,17 +729,17 @@ AC_CACHE_CHECK([if \$CC accepts -O2], [ac_cv_c_o2], [CFLAGS="${CFLAGS_save} -O2" AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) -if test "${ac_cv_c_o2}" != "no"; then +if test "${ac_cv_c_o2}" != "no" -a "${target_cpu}" != "mipsel"; then if test "${ac_cv_c_o3}" = "no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" fi CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2" -else +else AC_CACHE_CHECK([if \$CC accepts -O], [ac_cv_c_o], [CFLAGS="${CFLAGS_save} -O" AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) - if test "${ac_cv_c_o}" != "no"; then + if test "${ac_cv_c_o}" != "no" -a "${target_cpu}" != "mipsel"; then if test "${ac_cv_c_o3}" = "no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" fi @@ -881,8 +891,8 @@ test "${enable_cprof}" != "yes" && enable_cprof="no" dnl dnl default modules dnl -AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys]) -AX_ADD_PLUGINS([mpgv mpga m4v mpeg_system ps ps2 pva ts avi asf aac mp4 rawdv demux2 nsv real aiff]) +AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync]) +AX_ADD_PLUGINS([mpgv mpga m4v h264 mpeg_system ps ps2 pva ts_old avi asf aac mp4 rawdv demux2 nsv real aiff mjpeg]) AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak]) AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur]) AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32]) @@ -891,10 +901,10 @@ AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer]) AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer]) AX_ADD_PLUGINS([aout_file]) AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga]) -AX_ADD_PLUGINS([id3 m3u playlist export]) +AX_ADD_PLUGINS([id3 m3u playlist export sgimb]) AX_ADD_PLUGINS([rawvideo]) AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys dtssys au]) -AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms]) +AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms access2]) AX_ADD_PLUGINS([access_ftp access_directory sap http]) dnl @@ -968,7 +978,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly], [CFLAGS="${CFLAGS_save}" AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));], ac_cv_sse_inline=yes, ac_cv_sse_inline=no)]) -if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "mingw32"; then +if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "solaris"; then AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.) ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" fi @@ -990,6 +1000,7 @@ if test "${ac_cv_altivec_inline}" != "no"; then AX_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}]) AX_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}]) AX_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}]) + AX_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}]) AX_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}]) fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" @@ -997,14 +1008,27 @@ fi AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], [ac_cv_c_altivec], - [CFLAGS="${CFLAGS_save} -faltivec" - # Darwin test - AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], - ac_cv_c_altivec=-faltivec, [ - # Linux/PPC test - CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec" - AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], - [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no) + [# Darwin test + CFLAGS="${CFLAGS_save} -faltivec" + AC_TRY_COMPILE([], + [vec_ld(0, (unsigned char *)0);], + [ac_cv_c_altivec="-faltivec"], + [# Linux/PPC test + CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -maltivec -mabi=altivec" + AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H + #include + #endif], + [vec_ld(0, (unsigned char *)0);], + [ac_cv_c_altivec="-maltivec -mabi=altivec"], + [# Linux/PPC test (old GCC versions) + CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec" + AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H + #include + #endif], + [vec_ld(0, (unsigned char *)0);], + [ac_cv_c_altivec="-fvec"], + [ac_cv_c_altivec=no]) + ]) ]) CFLAGS="${CFLAGS_save}"]) if test "${ac_cv_c_altivec}" != "no"; then @@ -1095,8 +1119,8 @@ AC_ARG_ENABLE(sout, if test "${enable_sout}" != "no" then AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http]) - AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_mp4 mux_asf mux_dummy]) - AX_ADD_PLUGINS([packetizer_mpegvideo]) + AX_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy]) + AX_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) AX_ADD_PLUGINS([packetizer_copy]) @@ -1389,7 +1413,7 @@ dnl libdvdnav plugin dnl AC_ARG_ENABLE(dvdnav, [ --enable-dvdnav dvdnav input module (default enabled)]) -if test "${enable_caca}" != "no" +if test "${enable_dvdnav}" != "no" then DVDNAV_PATH="${PATH}" AC_ARG_WITH(dvdnav-config-path, @@ -1439,8 +1463,8 @@ then if test -z "${with_dvbpsi_tree}" then AC_CHECK_HEADERS(dvbpsi/dr.h, - [ AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi ts2]) - AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-ldvbpsi]) ], + [ AX_ADD_PLUGINS([ts_old_dvbpsi mux_ts ts]) + AX_ADD_LDFLAGS([ts_old_dvbpsi mux_ts ts],[-ldvbpsi]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], [#if defined( HAVE_STDINT_H ) # include @@ -1464,9 +1488,9 @@ then then dnl Use a custom libdvbpsi AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) - AX_ADD_BUILTINS([ts_dvbpsi mux_ts_dvbpsi ts2]) - AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-I${real_dvbpsi_tree}/src]) - AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi]) + AX_ADD_BUILTINS([ts_old_dvbpsi mux_ts ts]) + AX_ADD_CPPFLAGS([ts_old_dvbpsi mux_ts ts],[-I${real_dvbpsi_tree}/src]) + AX_ADD_LDFLAGS([ts_old_dvbpsi mux_ts ts],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi]) else dnl The given libdvbpsi wasn't built AC_MSG_RESULT(no) @@ -1489,9 +1513,9 @@ then fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" AC_CHECK_HEADERS([dvbpsi/dr.h],[ - AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi ts2]) - AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[${CPPFLAGS_test}]) - AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[${LDFLAGS_test} -ldvbpsi]) + AX_ADD_PLUGINS([ts_old_dvbpsi mux_ts ts]) + AX_ADD_CPPFLAGS([ts_old_dvbpsi mux_ts ts],[${CPPFLAGS_test}]) + AX_ADD_LDFLAGS([ts_old_dvbpsi mux_ts ts],[${LDFLAGS_test} -ldvbpsi]) ],[ if test -n "${enable_dvbpsi}" @@ -1548,7 +1572,10 @@ AC_ARG_ENABLE(vcdx, [ --enable-vcdx VCD support with Navigation (default enabled)]) AC_ARG_ENABLE(cdda, - [ --enable-cdda CDDA plugin support (default enabled)]) + [ --enable-cdda CDDA plugin support (default enabled)]) + +AC_ARG_ENABLE(cddax, + [ --enable-cddax CDDAX plugin support (default enabled)]) if test "${enable_cddax}" != "no" then @@ -1628,7 +1655,7 @@ then if test "${SYS}" = "darwin" then AX_ADD_PLUGINS([vcd cdda]) - AX_ADD_LDFLAGS([vcd cdda],[-framework IOKit -framework CoreFoundation]) + AX_ADD_LDFLAGS([vcd vcdx cdda],[-framework IOKit -framework CoreFoundation]) fi fi @@ -1777,12 +1804,12 @@ then AC_MSG_ERROR([${with_mad_tree} directory doesn't exist]) fi dnl Use a custom libmad - AC_MSG_CHECKING(for mad.h in ${real_mad_tree}/libmad) - if test -f ${real_mad_tree}/libmad/mad.h + AC_MSG_CHECKING(for mad.h in ${real_mad_tree}) + if test -f ${real_mad_tree}/mad.h then AC_MSG_RESULT(yes) - AX_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}/libmad]) - AX_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/libmad/.libs]) + AX_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}]) + AX_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/.libs]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}" AC_CHECK_LIB(mad, mad_bit_init, [ AX_ADD_BUILTINS([mpgatofixed32]) @@ -1881,7 +1908,7 @@ then AC_MSG_RESULT(no) AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}]) fi - if ! grep -q "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then + if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then dnl The given libavcodec wasn't built with --enable-pp AC_MSG_RESULT(no) AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp]) @@ -1929,7 +1956,7 @@ then dnl Use a custom faad AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a) AX_ADD_BUILTINS([faad]) - AX_ADD_LDFLAGS([faad],[-L${real_faad_tree}/libfaad/.libs -lfaad]) + AX_ADD_LDFLAGS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a]) AX_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include]) else dnl The given libfaad wasn't built @@ -1944,7 +1971,10 @@ then AC_CHECK_LIB(faad, faacDecOpen, [ AX_ADD_PLUGINS([faad]) AX_ADD_LDFLAGS([faad],[-lfaad]) ], - [ AC_MSG_ERROR([Cannot find libfaad library...]) ]) + AC_CHECK_LIB(faad, NeAACDecOpen, [ + AX_ADD_PLUGINS([faad]) + AX_ADD_LDFLAGS([faad],[-lfaad]) ], + [ AC_MSG_ERROR([Cannot find libfaad library...]) ])) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" fi @@ -2154,16 +2184,18 @@ if test "${enable_dts}" != "no"; then AC_MSG_ERROR([the specified tree doesn't have dts.h]) fi else + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}" AC_CHECK_HEADERS(dts.h, [ AC_CHECK_LIB(dts, dts_free, [ AX_ADD_PLUGINS([dtstofloat32]) AX_ADD_LDFLAGS([dtstofloat32],[-ldts]) ],[ if test "${enable_dts}" = "yes"; then - AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.]) + AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.html]) fi ]) ]) + LDFLAGS="${LDFLAGS_save}" fi fi @@ -2282,8 +2314,19 @@ AC_ARG_ENABLE(speex, if test "${enable_speex}" != "no" then AC_CHECK_HEADERS(speex.h, [ - AX_ADD_PLUGINS([speex]) - AX_ADD_LDFLAGS([speex],[-lspeex]) ],[]) + AC_MSG_CHECKING(for libspeex version > 1.1.0) + AC_EGREP_CPP(yes, + [#include + #ifdef SPEEX_SET_SUBMODE_ENCODING + yes + #endif], + [ AC_MSG_RESULT([yes]) + AX_ADD_PLUGINS([speex]) + AX_ADD_LDFLAGS([speex],[-lspeex]) ], + [ AC_MSG_RESULT([no]) + AC_MSG_WARN([Your libspeex is too old, please get the development + version.]) ] ) + ],[]) fi dnl @@ -2343,6 +2386,16 @@ AX_ADD_LDFLAGS([subsdec],[${LIBICONV}]) AX_ADD_CPPFLAGS([subsdec],[${INCICONV}]) AX_ADD_PLUGINS([subsdec]) +dnl +dnl CMML plugin +dnl +AC_ARG_ENABLE(cmml, + [ --enable-cmml CMML support (default enabled)]) +if test "${enable_cmml}" != "no" +then + AX_ADD_PLUGINS([cmml]) +fi + dnl dnl Video Filters @@ -2355,7 +2408,7 @@ AC_CHECK_HEADERS(png.h, [ AX_ADD_LDFLAGS([logo],[-lpng -lz]) AX_ADD_PLUGINS([logo]) AX_ADD_LDFLAGS([svcdsub],[-lpng -lz]) - AX_ADD_LDFLAGS([cvdsub],[-lpng -lz]) + AX_ADD_LDFLAGS([cvdsub],[-lpng -lz -lm]) AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])]) dnl @@ -2396,14 +2449,6 @@ if test "${enable_x11}" != "no" && AX_ADD_PLUGINS([x11]) AX_ADD_LDFLAGS([x11],[-L${x_libraries} -lX11 -lXext]) AX_ADD_CPPFLAGS([x11],[-I${x_includes}]) - AC_CHECK_HEADERS(X11/extensions/Xinerama.h, [ - CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext" - AC_CHECK_LIB(Xinerama, XineramaQueryExtension, [ - AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) - AX_ADD_LDFLAGS([x11],[-lXinerama]) - ]) - CFLAGS="${CFLAGS_save}" - ]) ]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -2419,32 +2464,58 @@ if test "${enable_xvideo}" != "no" && CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" AC_CHECK_HEADERS(X11/extensions/Xv.h, [ CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext" - AC_CHECK_LIB(Xv_pic,XvPutImage, - # We have Xv_pic, that's good, we can build an xvideo.so plugin ! - AX_ADD_PLUGINS([xvideo]) - AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic]) - AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]), - AC_CHECK_LIB(Xv,XvPutImage,[ - # We don't have Xv_pic, but we have Xv, let's make xvideo.a as builtin + AC_CHECK_LIB(Xv,XvPutImage,[ + # If libXv.so is available, xvideo can be a plugin. Otherwise, we + # test for libXv_pic. + if test -f /usr/X11R6/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then AX_ADD_PLUGINS([xvideo]) - AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) - ],[ - # Otherwise... well, do nothing. - : - ]) - ) - AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[ - AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[ - AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) - AX_ADD_LDFLAGS([xvideo],[-lXinerama]) - ]) + AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) + else + AC_CHECK_LIB(Xv_pic,XvPutImage,[ + AX_ADD_PLUGINS([xvideo]) + AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) + AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic]) + ],[ + AX_ADD_BUILTINS([xvideo]) + AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) + AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) + ]) + fi ]) CFLAGS="${CFLAGS_save}" ] CPPFLAGS="${CPPFLAGS_save}") fi +dnl +dnl Check for the Xinerama extension +dnl +if test "${enable_xvideo}" != "no" && + (test "${SYS}" != "mingw32" || test "${enable_xvideo}" = "yes"); then + ac_cv_have_xinerama="no" + CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" + CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext" + AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[ + AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[ + AX_ADD_LDFLAGS([xvideo],[-lXinerama_pic]) + AX_ADD_LDFLAGS([x11],[-lXinerama_pic]) + ac_cv_have_xinerama="yes" + ],[ + AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[ + AX_ADD_LDFLAGS([xvideo],[-lXinerama]) + AX_ADD_LDFLAGS([x11],[-lXinerama]) + ac_cv_have_xinerama="yes" + ]) + ]) + ]) + if test "${ac_cv_have_xinerama}" = "yes"; then + AC_DEFINE(HAVE_XINERAMA, 1, [Define this if you have libXinerama installed]) + fi + CFLAGS="${CFLAGS_save}" + CPPFLAGS="${CPPFLAGS_save}" +fi + dnl dnl SDL module dnl @@ -2591,6 +2662,54 @@ then CPPFLAGS="${CPPFLAGS_save}" fi +dnl +dnl Qt Video output module +dnl (disabled by default) +dnl +dnl AC_ARG_ENABLE(qt_video, +dnl [ --enable-qt_video QT Video Output support (default disabled)]) +dnl if test "${enable_qt_video}" = "yes" +dnl then +dnl AX_ADD_PLUGINS([qt_video]) +dnl AX_ADD_LDFLAGS([qt_video],[-L${QTDIR}/lib]) +dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt_video}" +dnl AC_CHECK_LIB(qt-mt,main,[ +dnl AX_ADD_LDFLAGS([qt_video],[-lqt-mt]) +dnl ],[ +dnl AC_CHECK_LIB(qt,main,[ +dnl AX_ADD_LDFLAGS([qt_video],[-lqt]) +dnl ]) +dnl ]) +dnl NEED_QTE_MAIN=yes +dnl LDFLAGS="${LDFLAGS_save}" +dnl AX_ADD_CXXFLAGS([qt_video],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) +dnl fi + +dnl +dnl Roku HD1000 Video output module +dnl +AC_ARG_ENABLE(hd1000v, + [ --enable-hd1000v HD1000 Video Output module (default enabled on HD1000)]) +if test "${enable_hd1000v}" != "no" && + (test "${SYS}" != "mingw32" || test "${enable_hd1000v}" = "yes") +then + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([cascade/graphics/CascadeScreen.h cascade/graphics/CascadeBitmap.h], + [ + can_build_roku="yes" + ], + [ + can_build_roku="no" + AC_MSG_WARN([Not building Roku HD1000 compatible video output]) + ]) + if test "$can_build_roku" = "yes" + then + AX_ADD_PLUGINS([hd1000v]) + AX_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad]) + fi + AC_LANG_POP([C++]) +fi + dnl dnl Windows DirectX module dnl @@ -2850,6 +2969,21 @@ then ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) 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" && + (test "${SYS}" != "mingw32" || test "${enable_hd1000a}" = "yes") +then + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [ + AX_ADD_PLUGINS([hd1000a]) + AC_CHECK_LIB(HDMachineX225,main,AX_ADD_LDFLAGS([hd1000a],[-lHDMachineX225])) ]) + AC_LANG_POP([C++]) +fi + dnl dnl Interface plugins dnl @@ -2932,7 +3066,7 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS} LDFLAGS="${LDFLAGS_save} ${LDFLAGS_skins2}" AC_CHECK_LIB(xml2,xmlTextReaderConstName,[],[ skins2_missing_lib="yes" - AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version]) + AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version; maybe you are missing libpng.]) if test "${enable_skins2}" = "yes"; then AC_MSG_ERROR([libxml2 missing the xmlTextReader extension (required for skins2)]) fi]) @@ -3034,7 +3168,7 @@ dnl dnl PDA Gtk+2 module dnl AC_ARG_ENABLE(pda, - [ --enable-pda PDA interface needs Gtk2 support (default disabled)]) + [ --enable-pda PDA interface needs Gtk2 support (default disabled)]) if test "x${enable_pda}" = "xyes" then PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0]) @@ -3318,27 +3452,42 @@ then dnl test for --with-goom-tree dnl if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}"; then - AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) + AC_MSG_CHECKING(for libgoom2.a in ${with_goom_tree}) real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`" if test -z "${real_goom_tree}"; then dnl The given directory can't be found AC_MSG_RESULT(no) AC_MSG_ERROR([cannot cd to ${with_goom_tree}]) fi - if test -f "${real_goom_tree}/libgoom.a"; then - AC_MSG_RESULT(${real_goom_tree}/libgoom.a) + if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then + AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a) AX_ADD_BUILTINS([goom]) - AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom]) - AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}]) + AX_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) + AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE]) else - dnl The given libgoom wasn't built + dnl The given libgoom2 wasn't built, try to look for the old goom AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_goom_tree}/libgoom.a, make sure you compiled goom in ${with_goom_tree}]) + AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) + if test -f "${real_goom_tree}/libgoom.a"; then + AC_MSG_RESULT(${real_goom_tree}/libgoom.a) + AX_ADD_BUILTINS([goom]) + AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom]) + AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM]) + else + dnl The given libgoom wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_goom_tree}/src/.libs/libgoom2.a, make sure you compiled goom in ${with_goom_tree}]) + fi fi else - dnl The --with-goom-tree isn't specified wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([You have to specify a tree with --with-goom-tree]) + AC_CHECK_HEADERS(goom/goom.h, [ + AC_CHECK_LIB(goom2, goom_init, [ + AX_ADD_PLUGINS([goom]) + AX_ADD_LDFLAGS([goom],[-lgoom2]) + ],[ + AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.]) + ]) + ]) fi fi @@ -3406,37 +3555,29 @@ then ) fi - dnl dnl corba (ORBit) plugin dnl +dnl Default: do not enable corba +enablecorba=false AC_ARG_ENABLE(corba, [ --enable-corba corba interface support (default disabled)]) if test "${enable_corba}" = "yes"; then - ORBIT_PATH="${PATH}" - AC_ARG_WITH(orbit-config-path, - [ --with-orbit-config-path=PATH orbit-config path (default search in \$PATH)]) - if test "${with_orbit_config_path}" != "no"; then - ORBIT_PATH="${with_orbit_config_path}:${PATH}" - fi - # look for orbit2-config - AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no, ${ORBIT_PATH}) - if test "${ORBIT_CONFIG}" != "no"; then - AX_ADD_CFLAGS(corba,[`${ORBIT_CONFIG} --cflags server`]) - AX_ADD_LDFLAGS(corba,[`${ORBIT_CONFIG} --libs server | sed 's,-rdynamic,,'`]) - # now look for the orbit.h header - CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_corba}" - ac_cv_corba_headers=yes - AC_CHECK_HEADERS(orbit/orbit.h, , [ - ac_cv_corba_headers=no - AC_MSG_ERROR([Could not find corba development headers]) - ]) - if test "${ac_cv_corba_headers}" = "yes"; then - AX_ADD_PLUGINS(corba) - fi - CPPFLAGS="${CPPFLAGS_save}" - fi -fi + GLIB_VERSION=2.3.2 + PKG_CHECK_MODULES(CORBA, + ORBit-2.0 >= 2.8.0 \ + glib-2.0 >= $GLIB_VERSION \ + gobject-2.0 >= $GLIB_VERSION \ + gthread-2.0 >= $GLIB_VERSION, + [ + enablecorba=true + AX_ADD_LDFLAGS([corba],[$CORBA_LIBS]) + AX_ADD_CFLAGS([corba],[$CORBA_CFLAGS]) + AX_ADD_PLUGINS([corba snapshot]) ], + [ enablecorba=false + AC_MSG_WARN(corba library not found) ]) +fi +AM_CONDITIONAL(ENABLE_CORBA, test x$enablecorba = xtrue) AC_ARG_WITH(,[Misc options:]) @@ -3531,6 +3672,7 @@ then dnl special case for mingw32 elif test "${enable_mozilla}" = "yes" then + AC_CHECK_TOOL(CYGPATH, cygpath, "") AC_ARG_WITH(mozilla-sdk-path, [ --with-mozilla-sdk-path=PATH path to win32 mozilla sdk], [ real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" @@ -3539,7 +3681,12 @@ then mozilla=: AX_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk} -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include]) AX_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -lnspr4 -lplds4 -lplc4 -lembedstring -lxpcomglue -Wl,--kill-at]) - XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl" ]) + XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl" + if test -n "${CYGPATH}"; then + XPIDL="${real_mozilla_sdk}/xpcom/bin/xpidl" + real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`" + XPIDL_INCL="${XPIDL_INCL} -I\"${real_mozilla_sdk}/xpcom/idl\"" + fi ]) CPPFLAGS="${CPPFLAGS_save}" ]) fi @@ -3608,9 +3755,9 @@ dnl if test "${NEED_QTE_MAIN}" != "no" then AX_ADD_PLUGINS([qte_main]) - AX_ADD_CPPFLAGS([qte opie vout_sdl],[-DNEED_QTE_MAIN]) - AX_ADD_CXXFLAGS([qte_main],[${CPPFLAGS_qte} ${CXXFLAGS_qte}]) - AX_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte}]) + AX_ADD_CXXFLAGS([opie qte qt_video],[-DNEED_QTE_MAIN]) + AX_ADD_CXXFLAGS([qte_main],[${CXXFLAGS_qte} ${CXXFLAGS_qt_video}]) + AX_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}]) fi @@ -3668,7 +3815,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-2003 VideoLAN", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2004 VideoLAN", [Copyright string]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`" @@ -3758,13 +3905,13 @@ AC_CONFIG_FILES([ modules/audio_mixer/Makefile modules/audio_output/Makefile modules/codec/Makefile + modules/codec/cmml/Makefile modules/codec/ffmpeg/Makefile modules/codec/ffmpeg/postprocessing/Makefile modules/codec/ogt/Makefile modules/codec/spudec/Makefile modules/control/Makefile modules/control/corba/Makefile - modules/control/telnet/Makefile modules/demux/Makefile modules/demux/asf/Makefile modules/demux/avi/Makefile @@ -3779,7 +3926,6 @@ AC_CONFIG_FILES([ modules/gui/gtk2/Makefile modules/gui/kde/Makefile modules/gui/macosx/Makefile - modules/gui/ncurses/Makefile modules/gui/qnx/Makefile modules/gui/qt/Makefile modules/gui/skins/Makefile