dnl Autoconf settings for vlc
dnl $Id$
-
-AC_INIT(vlc,0.7.2-cvs)
+
+AC_INIT(vlc,0.7.2-test2)
CONFIGURE_LINE="$0 $*"
CODENAME="Bond"
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.2-test2)
AM_CONFIG_HEADER(config.h)
dnl
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
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)
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"
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([mpgv mpga m4v h264 mpeg_system ps ps2 pva ts avi asf aac mp4 rawdv demux2 nsv real aiff])
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])
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])
[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
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}"
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 <altivec.h>
+ #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 <altivec.h>
+ #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
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([packetizer_mpegvideo packetizer_h264])
AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
AX_ADD_PLUGINS([packetizer_copy])
[ --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
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])
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/libfaad.a])
+ 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
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
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
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
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
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 Windows DirectX module
dnl
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])
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`"
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
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
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/.-+/___/'`"
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
projects / vlc / blobdiff