fi
dnl Gettext stuff
-ALL_LINGUAS="de en_GB fr ja no ru nl pl"
+ALL_LINGUAS="de en_GB fr ja no ru nl pl se"
AC_DEFINE_UNQUOTED(VLC_PACKAGE, "${PACKAGE}", [Package name])
AC_DEFINE_UNQUOTED(VLC_VERSION, "${VERSION}", [Package version])
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
+dnl Check for compiler properties
+AC_C_CONST
+AC_C_INLINE
+
dnl
dnl Set default LDFLAGS
dnl
x11_LDFLAGS="${x11_LDFLAGS} -lsocket"
xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket"
;;
+ xsolaris*)
+ SYS=solaris
+ ;;
xbeos)
SYS=beos
save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CFLAGS="${save_CFLAGS}"
vlc_LDFLAGS="${vlc_LDFLAGS} -lbe"
plugins_LDFLAGS="${plugins_LDFLAGS} -nostart"
- beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker"
+ beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker -lstdc++.r4"
ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind"
;;
x*)
http_LDFLAGS="${http_LDFLAGS} -lsocket"
)])
AC_CHECK_FUNC(gethostbyname,,[
- AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl")
-])
-AC_CHECK_FUNC(gethostbyname,,[
- AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind")
+ AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl",[
+ AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind")])
])
have_nanosleep=0
AC_CHECK_FUNC(nanosleep,have_nanosleep=1,[
AC_DEFINE(HAVE_NANOSLEEP, 1,
Define if nanosleep is available.)
fi
+# HP/UX port
+AC_CHECK_LIB(rt,sem_init, [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"])
+
AC_CHECK_FUNC(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv")
])
imdct_LDFLAGS="${imdct_LDFLAGS} -lm"
imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm"
imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm"
- chroma_i420_rgb_LDFLAGS="${chroma_i420_rgb_LDFLAGS} -lm"
+ i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm"
+ faad_LDFLAGS="${faad_LDFLAGS} -lm"
)
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
if test "x${THREAD_LIB}" = "xerror"; then
- AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+ AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
fi
if test "x${THREAD_LIB}" = "xerror"; then
- AC_CHECK_LIB(pthreads,pthread_attr_init,THREAD_LIB="-lpthreads")
+ AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads")
fi
if test "x${THREAD_LIB}" = "xerror"; then
- AC_CHECK_LIB(c_r,pthread_attr_init,THREAD_LIB="-lc_r")
+ AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
fi
if test "x${THREAD_LIB}" = "xerror"; then
- AC_CHECK_FUNC(pthread_attr_init)
+ AC_CHECK_FUNC(pthread_mutex_lock)
THREAD_LIB=""
fi
x_libraries="/usr/X11R6/lib"
fi
+dnl Build the gtk_main plugin?
+NEED_GTK_MAIN=no
+
dnl Check for DPMS
if test "x${SYS}" != "xmingw32"
then
if test "x${ac_cv_c_omit_frame_pointer}" != "xno"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
# this plugin does not compile without -fomit-frame-pointer, damn gcc!
- chroma_i420_yuy2_mmx_CFLAGS="${chroma_i420_yuy2_mmx_CFLAGS} -fomit-frame-pointer"
+ i420_yuy2_mmx_CFLAGS="${i420_yuy2_mmx_CFLAGS} -fomit-frame-pointer"
fi
dnl Check for Darwin plugin linking flags
dnl
dnl default modules
dnl
-BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix mpeg_adec ac3_adec mpeg_vdec"
-PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_audio mpeg_ps mpeg_ts file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga"
+BUILTINS="${BUILTINS}"
+PLUGINS="${PLUGINS} misc/dummy/dummy misc/null"
+PLUGINS="${PLUGINS} control/rc/rc misc/logger/logger access/file misc/memcpy/memcpy"
+PLUGINS="${PLUGINS} demux/mpeg/es demux/mpeg/audio demux/mpeg/mpeg_system demux/mpeg/ps demux/mpeg/ts"
+PLUGINS="${PLUGINS} codec/mpeg_video/idct/idct codec/mpeg_video/idct/idctclassic codec/mpeg_video/motion/motion codec/mpeg_video/mpeg_video codec/spudec/spudec codec/spdif codec/mpeg_audio/mpeg_audio"
+PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/a52old/a52old"
+#PLUGINS="${PLUGINS} codec/lpcm/lpcm"
+PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop"
+PLUGINS="${PLUGINS} audio_filter/converter/float32tos16 audio_filter/converter/float32tos8 audio_filter/converter/float32tou16 audio_filter/converter/float32tou8 audio_filter/converter/a52tospdif audio_filter/converter/fixed32tofloat32 audio_filter/converter/fixed32tos16 audio_filter/converter/s16tofloat32"
+PLUGINS="${PLUGINS} audio_filter/resampler/trivial"
+PLUGINS="${PLUGINS} audio_filter/channel_mixer/trivial"
+PLUGINS="${PLUGINS} audio_mixer/trivial audio_mixer/spdif"
+PLUGINS="${PLUGINS} audio_output/file"
+#PLUGINS="${PLUGINS} visualization/scope/scope"
+PLUGINS="${PLUGINS} video_chroma/i420_rgb video_chroma/i420_yuy2 video_chroma/i422_yuy2 video_chroma/i420_ymga"
+
+dnl
+dnl Network modules
+dnl
+NETWORK_MODULES="access/udp access/http access/rtp misc/network/ipv4"
dnl
dnl Accelerated modules
dnl
-MMX_MODULES="memcpymmx idctmmx motionmmx chroma_i420_rgb_mmx chroma_i420_yuy2_mmx chroma_i422_yuy2_mmx chroma_i420_ymga_mmx"
-MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
-THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
-SSE_MODULES="imdctsse downmixsse"
-ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec"
+MMX_MODULES="misc/memcpy/memcpymmx codec/mpeg_video/idct/idctmmx codec/mpeg_video/motion/motionmmx video_chroma/i420_rgb_mmx video_chroma/i420_yuy2_mmx video_chroma/i422_yuy2_mmx video_chroma/i420_ymga_mmx"
+MMXEXT_MODULES="misc/memcpy/memcpymmxext codec/mpeg_video/idct/idctmmxext codec/mpeg_video/motion/motionmmxext"
+THREEDNOW_MODULES="misc/memcpy/memcpy3dn codec/a52old/imdct/imdct3dn codec/a52old/downmix/downmix3dn"
+SSE_MODULES="codec/a52old/imdct/imdctsse codec/a52old/downmix/downmixsse"
+ALTIVEC_MODULES="codec/mpeg_video/idct/idctaltivec codec/mpeg_video/motion/motionaltivec misc/memcpy/memcpyaltivec"
+
+if test x$SYS != xbeos
+then
+ PLUGINS="${PLUGINS} ${NETWORK_MODULES}"
+fi
AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
[ac_cv_mmx_inline],
if test "x${with_dvdcss_tree}" = x
then
AC_CHECK_HEADERS(dvdcss/dvdcss.h,
- [ PLUGINS="${PLUGINS} dvd"
+ [ PLUGINS="${PLUGINS} access/dvd/dvd"
dvd_LDFLAGS="${dvd_LDFLAGS} -ldvdcss" ],
[ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss=<path/where/libdvdcss/was/installed> for dynamic linking (recommended under Unix) or --with-dvdcss-tree=<path/where/libdvdcss/was/built> for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.])
AC_MSG_ERROR([cannot find libdvdcss headers]) ])
then
dnl Use a custom libdvdcss
AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a)
- BUILTINS="${BUILTINS} dvd"
+ BUILTINS="${BUILTINS} access/dvd/dvd"
dvd_LDFLAGS="${dvd_LDFLAGS} ${real_dvdcss_tree}/src/.libs/libdvdcss.a"
dvd_CFLAGS="${dvd_CFLAGS} -I${real_dvdcss_tree}/src"
else
;;
xno)
dnl Compile without dvdcss (dlopen version, works only under Linux)
- PLUGINS="${PLUGINS} dvd"
+ PLUGINS="${PLUGINS} access/dvd/dvd"
dvd_CFLAGS="${dvd_CFLAGS} -DGOD_DAMN_DMCA"
dvd_LDFLAGS="${dvd_LDFLAGS} -ldl"
;;
then
dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h
AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} dvd"
+ PLUGINS="${PLUGINS} access/dvd/dvd"
dvd_LDFLAGS="${dvd_LDFLAGS} -L${with_dvdcss}/lib -ldvdcss"
dvd_CFLAGS="${dvd_CFLAGS} -I${with_dvdcss}/include"
else
CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
AC_CHECK_HEADERS(dvdread/dvd_reader.h, [
AC_TRY_COMPILE([#include <dvdread/dvd_reader.h>],
- [void foo() { int i=DVD_VIDEO_LB_LEN; }],[
- PLUGINS="${PLUGINS} dvdread"
+ [int foo() { return DVD_VIDEO_LB_LEN; }],[
+ PLUGINS="${PLUGINS} access/dvdread/dvdread"
dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread"
dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}"
],[
fi
fi
])
+ CPPFLAGS="$save_CPPFLAGS"
+fi
+
+dnl
+dnl dvdplay module: check for libdvdplay
+dnl
+AC_ARG_ENABLE(dvdplay,
+[ --enable-dvdplay dvdplay input module (default disabled)])
+if test "x$enable_dvdplay" != "xno"
+then
+ AC_ARG_WITH(dvdplay,
+ [ --with-dvdplay=PATH libdvdplay headers and libraries])
+ if test "x$with_dvdplay" = x
+ then
+ test_LDFLAGS=""
+ test_CFLAGS=""
+ else
+ test_LDFLAGS="-L${with_dvdplay}/lib"
+ test_CFLAGS="-I${with_dvdplay}/include"
+ fi
+ CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
+ AC_CHECK_HEADERS(dvdplay/dvdplay.h, [
+ PLUGINS="${PLUGINS} access/dvdplay/dvdplay"
+ dvdplay_LDFLAGS="${dvdplay_LDFLAGS} ${test_LDFLAGS} -ldvdplay -ldvdread"
+ dvdplay_CFLAGS="${dvdplay_CFLAGS} ${test_CFLAGS}"
+ ],[
+ if test "x$enable_dvdplay" != x
+ then
+ if test "x$with_dvdplay" != x
+ then
+ AC_MSG_ERROR([Cannot find dvdplay/dvdplay.h in ${with_dvdplay}/include])
+ else
+ AC_MSG_ERROR([Cannot find dvdplay/dvdplay.h])
+ fi
+ fi
+ ])
CPPFLAGS="${save_CPPFLAGS}"
fi
+
dnl
dnl libdvbpsi ts demux
dnl
if test "x${with_dvbpsi_tree}" = "x"
then
AC_CHECK_HEADERS(dvbpsi/dr.h,
- [ PLUGINS="${PLUGINS} mpeg_ts_dvbpsi"
- mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" ], [],
+ [ PLUGINS="${PLUGINS} demux/mpeg/ts_dvbpsi"
+ ts_dvbpsi_LDFLAGS="${ts_dvbpsi_LDFLAGS} -ldvbpsi" ], [],
[ AC_MSG_ERROR([cannot find libdvbpsi headers]) ])
else
AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree})
then
dnl Use a custom libdvbpsi
AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
- BUILTINS="${BUILTINS} mpeg_ts_dvbpsi"
- mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a"
- mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} -I${real_dvbpsi_tree}/src"
+ BUILTINS="${BUILTINS} demux/mpeg/ts_dvbpsi"
+ ts_dvbpsi_LDFLAGS="${ts_dvbpsi_LDFLAGS} ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a"
+ ts_dvbpsi_CFLAGS="${ts_dvbpsi_CFLAGS} -I${real_dvbpsi_tree}/src"
else
dnl The given libdvbpsi wasn't built
AC_MSG_RESULT(no)
fi
;;
xno)
- dnl Compile without dvbpsi (dlopen version, works only under Linux)
+ dnl Compile without dvbpsi
;;
*)
AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi})
fi
CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
AC_CHECK_HEADER([dvbpsi/dr.h],[
- PLUGINS="${PLUGINS} mpeg_ts_dvbpsi"
- mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi"
- mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}"
+ PLUGINS="${PLUGINS} demux/mpeg/ts_dvbpsi"
+ ts_dvbpsi_LDFLAGS="${ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi"
+ ts_dvbpsi_CFLAGS="${ts_dvbpsi_CFLAGS} ${test_CFLAGS}"
],[
if test "x${enable_dvbpsi}" != "x"
then
esac
fi
+dnl
+dnl Video4Linux plugin
+dnl
+AC_ARG_ENABLE(v4l,
+ [ --enable-v4l Video4Linux input support (default disabled)])
+if test "x${enable_v4l}" = "xyes"
+then
+ AC_CHECK_HEADERS(libv4l/v4l.h, [
+ PLUGINS="${PLUGINS} access/v4l/v4l"
+ ],[])
+fi
+
dnl
dnl VCD module
dnl
if test "x${enable_vcd}" != "xno"
then
AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
- PLUGINS="${PLUGINS} vcd"
+ PLUGINS="${PLUGINS} access/vcd/vcd"
])
AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[
- PLUGINS="${PLUGINS} vcd"
+ PLUGINS="${PLUGINS} access/vcd/vcd"
AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support)
])
if test "x${SYS}" = "xbsdi"
then
- PLUGINS="${PLUGINS} vcd"
+ PLUGINS="${PLUGINS} access/vcd/vcd"
fi
if test "x${SYS}" = "xdarwin"
[ --enable-satellite satellite card support (default disabled)],
[ if test "x${enable_satellite}" = "xyes"
then
- PLUGINS="${PLUGINS} satellite"
+ PLUGINS="${PLUGINS} access/satellite/satellite"
fi])
dnl
dnl
if test "x${SYS}" != "xnto" && test "x${SYS}" != "xmingw32"
then
- AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"],[
+ have_ipv6=0
+ AC_CHECK_FUNC(inet_pton,[have_ipv6=1],[
AC_CHECK_LIB(resolv,inet_pton,
- [PLUGINS="${PLUGINS} ipv6"
+ [have_ipv6=1
ipv6_LDFLAGS="${ipv6_LDFLAGS} -lresolv"])
])
+ AC_MSG_CHECKING(for sockaddr_in6 in netinet/in.h)
+ AC_EGREP_HEADER(sockaddr_in6,netinet/in.h,
+ [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); have_ipv6=0])
+ if test x$have_ipv6 = x1; then
+ PLUGINS="${PLUGINS} misc/network/ipv6"
+ fi
fi
if test "x${SYS}" = "xmingw32"
then
AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h)
AC_EGREP_HEADER(addrinfo,ws2tcpip.h,[AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} ipv6"],[AC_MSG_RESULT(no)])
+ PLUGINS="${PLUGINS} misc/network/ipv6"],[AC_MSG_RESULT(no)])
fi
dnl
[ --enable-avi AVI demux module (default enabled)])
if test "x${enable_avi}" != "xno"
then
- PLUGINS="${PLUGINS} avi"
+ PLUGINS="${PLUGINS} demux/avi/avi"
+fi
+
+dnl
+dnl AAC demux plugin
+dnl
+AC_ARG_ENABLE(aac,
+ [ --enable-aac AAC demux module (default enabled)])
+if test "x${enable_aac}" != "xno"
+then
+ PLUGINS="${PLUGINS} demux/aac/aac"
fi
dnl
mad_LDFLAGS="${mad_LDFLAGS} -L${real_mad_tree}/libmad/.libs"
LDFLAGS="${save_LDFLAGS} ${mad_LDFLAGS}"
AC_CHECK_LIB(mad, mad_bit_init, [
- BUILTINS="${BUILTINS} mad"
+ BUILTINS="${BUILTINS} codec/mad/mad"
mad_LDFLAGS="${mad_LDFLAGS} -lmad"
],[ AC_MSG_ERROR([the specified tree hasn't been compiled ])
],[])
AC_CHECK_HEADERS(mad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libmad...]) ])
AC_CHECK_LIB(mad, mad_bit_init, [
- PLUGINS="${PLUGINS} mad"
+ PLUGINS="${PLUGINS} codec/mad/mad"
mad_LDFLAGS="${mad_LDFLAGS} -lmad" ],
[ AC_MSG_ERROR([Cannot find libmad library...]) ])
CFLAGS="${save_CFLAGS}"
fi
fi
+dnl
+dnl libid3tag support
+dnl
+AC_CHECK_HEADERS(id3tag.h, [audio_LDFLAGS="${audio_LDFLAGS} -lz -lid3tag"])
+
dnl
dnl ffmpeg decoder plugin
dnl
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -L${with_ffmpeg}/lib"
fi
+ dnl Add postprocessing modules
+ PLUGINS="${PLUGINS} codec/ffmpeg/postprocessing/postprocessing_c"
+ if test "x${ac_cv_mmx_inline}" != "xno"; then
+ PLUGINS="${PLUGINS} codec/ffmpeg/postprocessing/postprocessing_mmx"
+ fi
+
+ if test "x${ac_cv_mmxext_inline}" != "xno"; then
+ PLUGINS="${PLUGINS} codec/ffmpeg/postprocessing/postprocessing_mmxext"
+ fi
+
+
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
if test "x${with_ffmpeg_tree}" != "x"
then
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
- BUILTINS="${BUILTINS} ffmpeg"
- ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a -lm"
+ BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg"
+ ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a"
ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec"
else
dnl The given libavcodec wasn't built
fi
else
CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}"
- LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS} -lm"
+ LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS}"
AC_CHECK_LIB(avcodec, avcodec_init, [
- BUILTINS="${BUILTINS} ffmpeg"
- ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" ],
+ BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg"
+ ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ],
[ AC_MSG_ERROR([Cannot find libavcodec library...]) ])
LDFLAGS="${save_LDFLAGS}"
CFLAGS="${save_CFLAGS}"
fi
fi
+dnl
+dnl faad decoder plugin
+dnl
+AC_ARG_ENABLE(faad,
+[ --enable-faad faad codec (default disabled)])
+if test "x${enable_faad}" = "xyes"
+then
+ AC_ARG_WITH(faad,
+ [ --with-faad=PATH path to faad installation],[],[])
+ if test "x${with_faad}" != "xno" -a "x${with_faad}" != "x"
+ then
+ faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include"
+ faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib"
+ fi
+ faad_LDFLAGS="${faad_LDFLAGS}"
-dnl special case for BeOS
-if test "x${SYS}" = "xbeos"
+ AC_ARG_WITH(faad-tree,
+ [ --with-faad-tree=PATH faad tree for static linking])
+ if test "x${with_faad_tree}" != "x"
+ then
+ AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree})
+ real_faad_tree="`cd ${with_faad_tree} 2>/dev/null && pwd`"
+ if test "x${real_faad_tree}" = x
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_faad_tree}])
+ fi
+ if test -f "${real_faad_tree}/libfaad/.libs/libfaad.a"
+ then
+ dnl Use a custom faad
+ AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
+ BUILTINS="${BUILTINS} codec/faad/faad"
+ faad_LDFLAGS="${faad_LDFLAGS} ${real_faad_tree}/libfaad/.libs/libfaad.a"
+ faad_CFLAGS="${faad_CFLAGS} -I${real_faad_tree}/include"
+ else
+ dnl The given libfaad wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_faad_tree}/libfaad/.libs/libfaad.a, make sure you compiled libfaad in ${with_faad_tree}])
+ fi
+ else
+ CFLAGS="${save_CFLAGS} ${faad_CFLAGS}"
+ LDFLAGS="${save_LDFLAGS} ${faad_LDFLAGS}"
+ AC_CHECK_HEADERS(faad.h, ,
+ [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ])
+ AC_CHECK_LIB(faad, faacDecOpen, [
+ PLUGINS="${PLUGINS} codec/faad/faad"
+ faad_LDFLAGS="${faad_LDFLAGS} -lfaad" ],
+ [ AC_MSG_ERROR([Cannot find libfaad library...]) ])
+ LDFLAGS="${save_LDFLAGS}"
+ CFLAGS="${save_CFLAGS}"
+ fi
+fi
+
+
+
+dnl
+dnl MP4 module
+dnl
+AC_ARG_ENABLE(mp4,
+ [ --enable-mp4 MP4 demux module (default enabled)])
+if test "x${enable_mp4}" != "xno"
then
- PLUGINS="${PLUGINS} beos"
+
+ PLUGINS="${PLUGINS} demux/mp4/mp4"
+ AC_CHECK_HEADERS(zlib.h,
+ [ mp4_LDFLAGS="${mp4_LDFLAGS} -lz" ] )
fi
dnl
dnl a52 AC3 decoder plugin
dnl
AC_ARG_ENABLE(a52,
- [ --enable-a52 AC3 support with liba52 (default enabled)])
+ [ --enable-a52 A/52 support with liba52 (default enabled)])
if test "x${enable_a52}" != "xno"
then
+ AC_ARG_WITH(a52,
+ [ --with-a52=PATH a52 headers and libraries])
AC_ARG_WITH(a52-tree,
[ --with-a52-tree=PATH a52dec tree for static linking ],[],[])
if test "x${with_a52_tree}" != "xno" -a "x${with_a52_tree}" != "x"
a52_LDFLAGS="${a52_LDFLAGS} -L${real_a52_tree}/liba52/.libs"
LDFLAGS="${save_LDFLAGS} ${a52_LDFLAGS}"
AC_CHECK_LIB(a52, a52_free, [
- BUILTINS="${BUILTINS} a52"
+ BUILTINS="${BUILTINS} codec/a52"
a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm"
a52_CFLAGS="${a52_CFLAGS} -DUSE_A52DEC_TREE"
],[
AC_MSG_RESULT(no)
AC_MSG_ERROR([the specified tree doesn't have a52.h])
fi
- else dnl no with args
+ else
+ if test "x${with_a52}" = "x"
+ then
+ test_LDFLAGS=""
+ test_CFLAGS=""
+ else
+ test_LDFLAGS="-L${with_a52}/lib"
+ test_CFLAGS="-I${with_a52}/include"
+ fi
+ save_CPPFLAGS="${CPPFLAGS}"
+ save_LDFLAGS="${LDFLAGS}"
+ CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
+ LDFLAGS="${save_LDFLAGS} ${test_LDFLAGS}"
AC_CHECK_HEADERS(a52dec/a52.h, [
AC_CHECK_LIB(a52, a52_free, [
- BUILTINS="${BUILTINS} a52"
- a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm"
- a52_CFLAGS="${a52_CFLAGS}"
- ],[],[-lm])
+ BUILTINS="${BUILTINS} codec/a52"
+ a52_LDFLAGS="${a52_LDFLAGS} ${test_LDFLAGS} -la52 -lm"
+ a52_CFLAGS="${a52_CFLAGS} ${test_CFLAGS}"
+ ],[
+ if test "x${enable_dvbpsi}" != "x"
+ then
+ AC_MSG_ERROR([Could not find a52 on your system: you may get it from http://liba52.sf.net])
+ fi
+ ],[-lm])
])
+ CPPFLAGS="${save_CPPFLAGS}"
+ LDFLAGS="${save_LDFLAGS}"
fi
fi
+dnl
+dnl cinepak plugin
+dnl
+AC_ARG_ENABLE(cinepak,
+ [ --enable-cinepak Cinepak decoder (default enabled)])
+if test "x${enable_cinepak}" != "xno"
+then
+ PLUGINS="${PLUGINS} codec/cinepak/cinepak"
+fi
+
dnl
dnl ogg vorbis plugin
dnl
then
AC_CHECK_HEADERS(ogg/ogg.h, [
dnl disabled for the moment
- #PLUGINS="${PLUGINS} vorbis"
+ #PLUGINS="${PLUGINS} demux/ogg/ogg codec/vorbis/vorbis"
vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis"
],[])
fi
+dnl
+dnl DV plugin
+dnl
+AC_ARG_ENABLE(dv,
+ [ --enable-dv DV decoder support (default disabled)])
+if test "x${enable_dv}" = "xyes"
+then
+ AC_CHECK_HEADERS(libdv/dv.h, [
+ BUILTINS="${BUILTINS} codec/dv/dv"
+ dv_LDFLAGS="${dv_LDFLAGS} -ldv"
+ ],[])
+fi
+
dnl
dnl Video plugins
dnl
(test "x${SYS}" != "xmingw32" || test "x${enable_x11}" = "xyes"); then
CPPFLAGS="${save_CPPFLAGS} -I${x_includes}"
AC_CHECK_HEADERS(X11/Xlib.h, [
- PLUGINS="${PLUGINS} x11"
+ PLUGINS="${PLUGINS} video_output/x11/x11"
x11_LDFLAGS="${x11_LDFLAGS} -L${x_libraries} -lX11 -lXext"
x11_CFLAGS="${x11_CFLAGS} -I${x_includes}"
])
CFLAGS="${save_CFLAGS} -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 !
- PLUGINS="${PLUGINS} xvideo"
+ PLUGINS="${PLUGINS} video_output/x11/xvideo"
xvideo_LDFLAGS="${xvideo_LDFLAGS} -L${x_libraries} -lX11 -lXext -lXv_pic"
xvideo_CFLAGS="${xvideo_CFLAGS} -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
- PLUGINS="${PLUGINS} xvideo"
+ PLUGINS="${PLUGINS} video_output/x11/xvideo"
xvideo_LDFLAGS="${xvideo_LDFLAGS} -L${x_libraries} -lX11 -lXext -lXv"
xvideo_CFLAGS="${xvideo_CFLAGS} -I${x_includes}",
# Otherwise... well, do nothing.
+ :
)
)
CFLAGS="${save_CFLAGS}"
fi
if test "x${SDL_CONFIG}" != "xno"
then
- PLUGINS="${PLUGINS} sdl"
+ PLUGINS="${PLUGINS} video_output/sdl audio_output/sdl"
sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} --cflags`"
sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
CPPFLAGS="${save_CPPFLAGS} ${sdl_CFLAGS}"
if test "x${with_directx}" = "x"
then
AC_CHECK_HEADERS(ddraw.h,
- [ PLUGINS="${PLUGINS} directx"
+ [ PLUGINS="${PLUGINS} video_output/directx/directx"
directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" ])
else
AC_MSG_CHECKING(for directX headers in ${with_directx})
if test -f ${with_directx}/ddraw.h
then
- PLUGINS="${PLUGINS} directx"
+ PLUGINS="${PLUGINS} video_output/directx/directx"
directx_LDFLAGS="${directx_LDFLAGS} -lgdi32"
directx_CFLAGS="${directx_CFLAGS} -I${with_directx}"
AC_MSG_RESULT(yes)
if test "x${enable_fb}" != "xno"
then
AC_CHECK_HEADERS(linux/fb.h, [
- PLUGINS="${PLUGINS} fb"
+ PLUGINS="${PLUGINS} video_output/fb"
])
fi
[ --enable-mga Linux kernel Matrox support (default disabled)],
[ if test "x${enable_mga}" = "xyes"
then
- PLUGINS="${PLUGINS} mga xmga"
+ PLUGINS="${PLUGINS} video_output/mga/mga video_output/mga/xmga"
fi ])
+dnl
+dnl SVGAlib module
+dnl
+AC_ARG_ENABLE(svgalib,
+ [ --enable-svgalib SVGAlib support (default disabled)])
+if test "x${enable_svgalib}" = "xyes"
+then
+ PLUGINS="${PLUGINS} video_output/svgalib"
+ svgalib_LDFLAGS="${svgalib_LDFLAGS} -lvgagl -lvga"
+fi
+
dnl
dnl GGI module
dnl
[ --enable-ggi GGI support (default disabled)])
if test "x${enable_ggi}" = "xyes"
then
- PLUGINS="${PLUGINS} ggi"
+ PLUGINS="${PLUGINS} video_output/ggi"
ggi_LDFLAGS="${ggi_LDFLAGS} -lggi"
AC_ARG_WITH(ggi,
[ --with-ggi=PATH path to libggi],
[ --enable-glide Glide (3dfx) support (default disabled)])
if test "x${enable_glide}" = "xyes"
then
- PLUGINS="${PLUGINS} glide"
+ PLUGINS="${PLUGINS} video_output/glide"
glide_LDFLAGS="${glide_LDFLAGS} -lglide2x -lm"
glide_CFLAGS="${glide_CFLAGS} -I/usr/include/glide"
AC_ARG_WITH(glide,
AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false")
if test "x${have_aa}" = "xtrue"
then
- PLUGINS="${PLUGINS} aa"
+ PLUGINS="${PLUGINS} video_output/aa"
aa_LDFLAGS="${aa_LDFLAGS} -laa"
fi
fi
dnl
dnl OSS /dev/dsp module (enabled by default except on win32)
dnl
-AC_ARG_ENABLE(dsp,
- [ --enable-dsp Linux /dev/dsp support (enabled on Linux)])
+AC_ARG_ENABLE(oss,
+ [ --enable-oss Linux OSS /dev/dsp support (enabled on Linux)])
-if test "x${enable_dsp}" != "xno" &&
- (test "x${SYS}" != "xmingw32" || test "x${enable_dsp}" = "xyes")
+if test "x${enable_oss}" != "xno" &&
+ (test "x${SYS}" != "xmingw32" || test "x${enable_oss}" = "xyes")
then
AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
- PLUGINS="${PLUGINS} dsp"
- AC_CHECK_LIB(ossaudio,main,dsp_LDFLAGS="${dsp_LDFLAGS} -lossaudio")
+ PLUGINS="${PLUGINS} audio_output/oss"
+ AC_CHECK_LIB(ossaudio,main,oss_LDFLAGS="${oss_LDFLAGS} -lossaudio")
])
fi
AC_PATH_PROG(ESD_CONFIG, esd-config, no)
if test "x${ESD_CONFIG}" != "xno"
then
- PLUGINS="${PLUGINS} esd"
+ PLUGINS="${PLUGINS} audio_output/esd"
esd_CFLAGS="${esd_CFLAGS} `${ESD_CONFIG} --cflags`"
esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`"
fi
AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
if test "x${ARTS_CONFIG}" != "xno"
then
- PLUGINS="${PLUGINS} arts"
+ PLUGINS="${PLUGINS} audio_output/arts"
arts_CFLAGS="${arts_CFLAGS} `${ARTS_CONFIG} --cflags`"
arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `"
fi
AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
if test "x${have_alsa}" = "xtrue"
then
- PLUGINS="${PLUGINS} alsa"
+ PLUGINS="${PLUGINS} audio_output/alsa"
alsa_LDFLAGS="${alsa_LDFLAGS} -lasound -lm -ldl"
fi
fi])
[ --enable-waveout Win32 waveOut module (default enabled on Win32)])
if test "x${enable_waveout}" != "xno" -a "x${SYS}" = "xmingw32"
then
- PLUGINS="${PLUGINS} waveout"
+ PLUGINS="${PLUGINS} audio_output/waveout"
waveout_LDFLAGS="-lwinmm"
fi
AC_ARG_WITH(,[Interface plugins:])
+dnl special case for BeOS
+if test "x${SYS}" = "xbeos"
+then
+ PLUGINS="${PLUGINS} gui/beos/beos"
+fi
+
dnl
dnl Gtk+ module
dnl
then
AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.])
fi
- gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk`"
- gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
+ gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk gthread`"
+ gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`"
# now look for the gtk.h header
CPPFLAGS="${save_CPPFLAGS} ${gtk_CFLAGS}"
ac_cv_gtk_headers=yes
])
if test "x${ac_cv_gtk_headers}" = "xyes"
then
- PLUGINS="${PLUGINS} gtk"
+ PLUGINS="${PLUGINS} gui/gtk/gtk"
+ NEED_GTK_MAIN=yes
ALIASES="${ALIASES} gvlc"
fi
CPPFLAGS="${save_CPPFLAGS}"
fi
fi
+dnl
+dnl Familiar module uses Gtk+ library
+dnl
+AC_ARG_ENABLE(familiar,
+ [ --enable-familiar Familiar Gtk+ support (default disabled)])
+if test "x${enable_familiar}" = "xyes"
+then
+ GTK_PATH="${PATH}"
+ AC_ARG_WITH(gtk-config-path,
+ [ --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)],
+ [ if test "x${with_gtk_config_path}" != "xno"
+ then
+ GTK_PATH="${with_gtk_config_path}:${PATH}"
+ fi ])
+ # look for gtk-config
+ AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH})
+ GTK_CONFIG=${GTK12_CONFIG}
+ if test "x${GTK_CONFIG}" = "xno"
+ then
+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH})
+ fi
+ if test "x${GTK_CONFIG}" != "xno"
+ then
+ if expr 1.2.0 \> `${GTK_CONFIG} --version` >/dev/null
+ then
+ AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-familiar.])
+ fi
+ familiar_CFLAGS="${familiar_CFLAGS} `${GTK_CONFIG} --cflags gtk gthread`"
+ familiar_LDFLAGS="${familiar_LDFLAGS} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`"
+ # now look for the gtk.h header
+ CPPFLAGS="${save_CPPFLAGS} ${familiar_CFLAGS}"
+ ac_cv_gtk_headers=yes
+ AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [
+ ac_cv_gtk_headers=no
+ echo "Cannot find gtk development headers."
+ ])
+ if test "x${ac_cv_gtk_headers}" = "xyes"
+ then
+ PLUGINS="${PLUGINS} gui/familiar/familiar"
+ NEED_GTK_MAIN=yes
+ fi
+ CPPFLAGS="${save_CPPFLAGS}"
+ fi
+fi
+
dnl
dnl Gnome module
dnl
# now look for the gnome.h header
CPPFLAGS="${save_CPPFLAGS} ${gnome_CFLAGS}"
AC_CHECK_HEADERS(gnome.h, [
- PLUGINS="${PLUGINS} gnome"
+ PLUGINS="${PLUGINS} gui/gtk/gnome"
+ NEED_GTK_MAIN=yes
ALIASES="${ALIASES} gnome-vlc"
],[
AC_MSG_ERROR([Can't find gnome headers. Please install the gnome
AC_ARG_ENABLE(qt,
[ --enable-qt Qt interface support (default disabled)],
[if test "x${enable_qt}" = "xyes"; then
- PLUGINS="${PLUGINS} qt"
+ PLUGINS="${PLUGINS} gui/qt/qt"
ALIASES="${ALIASES} qvlc"
qt_LDFLAGS="${qt_LDFLAGS} -lqt -L${QTDIR}/lib"
qt_CFLAGS="${qt_CFLAGS} -I/usr/include/qt -I${QTDIR}/include"
AC_ARG_ENABLE(kde,
[ --enable-kde KDE interface support (default disabled)],
[if test "x${enable_kde}" = "xyes"; then
- PLUGINS="${PLUGINS} kde"
+ PLUGINS="${PLUGINS} gui/kde/kde"
ALIASES="${ALIASES} kvlc"
kde_LDFLAGS="${kde_LDFLAGS} -L${KDEDIR}/lib -lkfile"
kde_CFLAGS="${kde_CFLAGS} -I/usr/include/kde -I/usr/include/qt"
fi
fi])
+dnl
+dnl Qt embedded module
+dnl
+AC_ARG_ENABLE(qte,
+ [ --enable-qte Qt embedded interface support (default disabled)],
+ [if test "x${enable_qte}" = "xyes"; then
+ PLUGINS="${PLUGINS} gui/qte/qte"
+ qte_LDFLAGS="${qte_LDFLAGS} -lqte -L${QTEDIR}/lib"
+ qte_CFLAGS="${qte_CFLAGS} -I/usr/include/qte -I${QTEDIR}/include"
+ if test -x ${QTEDIR}/bin/moc
+ then
+ MOC=${QTEDIR}/bin/moc
+ else
+ MOC=moc
+ fi
+ fi])
+
+
dnl
dnl MacOS X module
dnl
[ --enable-macosx MacOS X support (default enabled on MacOS X)],
[if test "x${enable_macosx}" = "xyes"
then
- BUILTINS="${BUILTINS} macosx"
+ BUILTINS="${BUILTINS} gui/macosx/macosx"
macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework AGL -framework QuickTime -lobjc -ObjC"
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
- BUILTINS="${BUILTINS} macosx"
+ BUILTINS="${BUILTINS} gui/macosx/macosx"
macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework AGL -framework QuickTime -lobjc -ObjC"
)])
if test "x${enable_qnx}" != "xno"
then
AC_CHECK_HEADERS(Ph.h, [
- PLUGINS="${PLUGINS} qnx"
+ PLUGINS="${PLUGINS} gui/qnx/qnx"
qnx_LDFLAGS="${qnx_LDFLAGS} -lasound -lph"
])
fi
then
BCBUILDER="${with_bcbuilder}"
fi
- PLUGINS="${PLUGINS} intfwin"
+ PLUGINS="${PLUGINS} gui/win32/win32"
fi ])
dnl
AC_ARG_ENABLE(ncurses,
[ --enable-ncurses ncurses interface support (default disabled)],
[if test "x${enable_ncurses}" = "xyes"; then
- PLUGINS="${PLUGINS} ncurses"
+ PLUGINS="${PLUGINS} gui/ncurses/ncurses"
ncurses_LDFLAGS="${ncurses_LDFLAGS} -lncurses"
fi])
if test "x${enable_xosd}" = "xyes"
then
AC_CHECK_HEADER(xosd.h, have_xosd="true", have_xosd="false")
+ AC_TRY_COMPILE([#include <xosd.h>],
+ [void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],,
+ AC_DEFINE(HAVE_OLD_XOSD_H, 1, Define if <xosd.h> is pre-1.0.0))
if test "x${have_xosd}" = "xtrue"
then
- PLUGINS="${PLUGINS} xosd"
+ PLUGINS="${PLUGINS} visualization/xosd/xosd"
xosd_LDFLAGS="${xosd_LDFLAGS} -lxosd"
fi
fi
AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false")
if test "x${have_lirc}" = "xtrue"
then
- PLUGINS="${PLUGINS} lirc"
+ PLUGINS="${PLUGINS} control/lirc/lirc"
lirc_LDFLAGS="${lirc_LDFLAGS} -llirc_client"
fi
fi
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
if test "x${MOZILLA_CONFIG}" != "xno"
then
+ if test "x${SYS}" != "xmingw32"; then
+ LDFLAGS="${save_LDFLAGS} -L${x_libraries}"
+ AC_CHECK_LIB(Xt,XtStrings,[
+ mozilla_LDFLAGS="${mozilla_LDFLAGS} -L${x_libraries} -lXt"
+ ])
+ LDFLAGS="${save_LDFLAGS}"
+ fi
MOZILLA=1
mozilla_CFLAGS="${mozilla_CFLAGS} `${MOZILLA_CONFIG} --cflags plugin java --defines | xargs`"
- mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs `"
+ dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
+ mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs | sed 's#-I\(.*\)/mozilla/\([^ ]*\)#-I\1/\2 -I\1/mozilla/\2#g'`"
fi
fi
+dnl
+dnl gtk_main plugin
+dnl
+if test "x${NEED_GTK_MAIN}" != "xno"
+then
+ PLUGINS="${PLUGINS} misc/gtk_main"
+ gtk_main_CFLAGS="${gtk_main_CFLAGS} ${gtk_CFLAGS} ${familiar_CFLAGS} ${gnome_CFLAGS}"
+ gtk_main_LDFLAGS="${gtk_main_LDFLAGS} ${gtk_LDFLAGS} ${familiar_LDFLAGS} ${gnome_LDFLAGS}"
+fi
+
dnl
dnl Plug-ins - this must be AT THE END
dnl
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
VLC_SYMBOL="`echo ${VERSION} | tr .- __`"
-AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__MODULE_${VLC_SYMBOL}", [String suffix for module functions])
+AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
DATA_PATH="${ac_tool_prefix}/share/videolan"
CFLAGS="${save_CFLAGS}"
LDFLAGS="${save_LDFLAGS}"
+dnl
+dnl Create the vlc-config script
+dnl
+libvlc_LDFLAGS="${vlc_LDFLAGS} ${builtins_LDFLAGS}"
+for i in `echo ${BUILTINS} | sed -e 's#[^ ]*/##g'` ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} ${libdir}/vlc/${i}.a `eval echo '$'{${i}_LDFLAGS}`" ; done
+AC_SUBST(libvlc_LDFLAGS)
+
dnl
dnl Configuration is finished
dnl
AC_SUBST(a52_CFLAGS)
AC_SUBST(arts_CFLAGS)
-AC_SUBST(chroma_i420_yuy2_mmx_CFLAGS)
+AC_SUBST(i420_yuy2_mmx_CFLAGS)
AC_SUBST(dvd_CFLAGS)
AC_SUBST(dvdread_CFLAGS)
-AC_SUBST(mpeg_ts_dvbpsi_CFLAGS)
+AC_SUBST(dvdplay_CFLAGS)
+AC_SUBST(ts_dvbpsi_CFLAGS)
AC_SUBST(directx_CFLAGS)
AC_SUBST(esd_CFLAGS)
+AC_SUBST(familiar_CFLAGS)
+AC_SUBST(faad_CFLAGS)
AC_SUBST(ffmpeg_CFLAGS)
AC_SUBST(glide_CFLAGS)
AC_SUBST(gnome_CFLAGS)
AC_SUBST(gtk_CFLAGS)
+AC_SUBST(gtk_main_CFLAGS)
AC_SUBST(kde_CFLAGS)
AC_SUBST(idctaltivec_CFLAGS)
AC_SUBST(macosx_CFLAGS)
AC_SUBST(memcpyaltivec_CFLAGS)
AC_SUBST(motionaltivec_CFLAGS)
AC_SUBST(qt_CFLAGS)
+AC_SUBST(qte_CFLAGS)
AC_SUBST(sdl_CFLAGS)
+AC_SUBST(svgalib_CFLAGS)
AC_SUBST(x11_CFLAGS)
AC_SUBST(xvideo_CFLAGS)
AC_SUBST(alsa_LDFLAGS)
AC_SUBST(arts_LDFLAGS)
AC_SUBST(beos_LDFLAGS)
-AC_SUBST(chroma_i420_rgb_LDFLAGS)
+AC_SUBST(i420_rgb_LDFLAGS)
AC_SUBST(directx_LDFLAGS)
-AC_SUBST(dsp_LDFLAGS)
+AC_SUBST(dv_LDFLAGS)
AC_SUBST(dvd_LDFLAGS)
AC_SUBST(dvdread_LDFLAGS)
-AC_SUBST(mpeg_ts_dvbpsi_LDFLAGS)
+AC_SUBST(dvdplay_LDFLAGS)
+AC_SUBST(ts_dvbpsi_LDFLAGS)
+AC_SUBST(audio_LDFLAGS)
AC_SUBST(esd_LDFLAGS)
-AC_SUBST(filter_distort_LDFLAGS)
+AC_SUBST(familiar_LDFLAGS)
+AC_SUBST(distort_LDFLAGS)
+AC_SUBST(faad_LDFLAGS)
AC_SUBST(ffmpeg_LDFLAGS)
+AC_SUBST(mp4_LDFLAGS)
AC_SUBST(ggi_LDFLAGS)
AC_SUBST(glide_LDFLAGS)
AC_SUBST(gnome_LDFLAGS)
AC_SUBST(gtk_LDFLAGS)
+AC_SUBST(gtk_main_LDFLAGS)
AC_SUBST(http_LDFLAGS)
AC_SUBST(idctaltivec_LDFLAGS)
AC_SUBST(imdct_LDFLAGS)
AC_SUBST(memcpyaltivec_LDFLAGS)
AC_SUBST(motionaltivec_LDFLAGS)
AC_SUBST(ncurses_LDFLAGS)
+AC_SUBST(oss_LDFLAGS)
AC_SUBST(qnx_LDFLAGS)
AC_SUBST(qt_LDFLAGS)
+AC_SUBST(qte_LDFLAGS)
AC_SUBST(rc_LDFLAGS)
AC_SUBST(sdl_LDFLAGS)
+AC_SUBST(svgalib_LDFLAGS)
AC_SUBST(vcd_LDFLAGS)
AC_SUBST(vorbis_LDFLAGS)
AC_SUBST(waveout_LDFLAGS)
AC_SUBST(xvideo_LDFLAGS)
AC_SUBST(xosd_LDFLAGS)
-AC_OUTPUT([Makefile.config Makefile.opts po/Makefile.in])
+AC_OUTPUT([Makefile.config Makefile.opts po/Makefile.in vlc-config])
+chmod a+x vlc-config
echo "
vlc configuration
release : ${RELEASE}
profiling : ${PROFILING}
need builtin getopt : ${NEED_GETOPT}
-built-in modules :${BUILTINS}
-plug-in modules :${PLUGINS}
+modules : (see Makefile.config)
mozilla plugin : ${MOZILLA}
vlc aliases :${ALIASES}
-You may now tune Makefile.opts at your convenience, for instance to choose
-which modules get compiled as plugins.
+You may now tune Makefile.config and Makefile.opts at your convenience, for
+instance to choose which modules get compiled as plugins, or tune CFLAGS.
To build vlc and its plugins, type \`${VLC_MAKE}'.
"
projects / vlc / blobdiff