Navigation

← Previous Changeset
Next Changeset →

Changeset 163b655bdf461bc56fa33d3bc95ac260a33bf939

Timestamp:

06/25/04 14:21:32 (4 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1088166092 +0000

git-parent:

[dbca5ca7b0bb1764f792cc705b52dfe2b70a6b9a]

git-author:

Sam Hocevar <sam@videolan.org> 1088166092 +0000

Message:

m4/vlc.m4 configure.ac:
+ Moved the shared object suffix detection to vlc.m4.
+ Replaced AX_* macros with VLC_* macros.

Files:

HACKING (modified) (2 diffs)
bootstrap (modified) (1 diff)
configure.ac (modified) (161 diffs)
m4/vlc.m4 (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

HACKING

rcbeedad	r163b655
1		$Id~~: HACKING,v 1.10 2003/07/07 17:01:16 sam Exp~~ $
	1	$Id$
2	2
3	3	Hacking vlc
…	…
67	67	Makefile line at the end of configure.ac.
68	68
69		To have the module built, you need to add a call to AX_ADD_PLUGINS or
70		AX_ADD_BUILTINS to configure.ac with your new module name as argument.
	69	To have the module built, you need to add a call to VLC_ADD_PLUGINS or
	70	VLC_ADD_BUILTINS to configure.ac with your new module name as argument.
71	71

bootstrap

r52a7d38	r163b655
134	134	dnl The required AM_CONDITIONAL calls
135	135	dnl XXX: too many conditionals make the build very slow, disabled them
136		AC_DEFUN([~~AX_~~VLC_CONDITIONALS], [
	136	AC_DEFUN([VLC_CONDITIONALS], [
137	137	EOF
138	138	rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF
139	139	dnl The required AC_SUBST calls
140		AC_DEFUN([~~AX_~~VLC_SUBSTS], [
	140	AC_DEFUN([VLC_SUBSTS], [
141	141	EOF
142	142	rm -f m4/private.m4-tmp3 && cat > m4/private.m4-tmp3 << EOF
143	143	dnl The required AC_OUTPUT calls
144	144	dnl XXX: this feature is only supported starting from automake-1.7
145		AC_DEFUN([~~AX_~~VLC_MAKEFILES], [AC_OUTPUT([
	145	AC_DEFUN([VLC_MAKEFILES], [AC_OUTPUT([
146	146	EOF
147	147	rm -f m4/private.m4-tmp4 && cat > m4/private.m4-tmp4 << EOF
148	148	dnl Helper macro for vlc-config generation
149		AC_DEFUN([~~AX_~~VLC_CONFIG_HELPER], [
	149	AC_DEFUN([VLC_CONFIG_HELPER], [
150	150	cat >> vlc-config.in << BLAH
151	151	EOF

configure.ac

rf52471d	r163b655
20	20	dnl Save *FLAGS
21	21	dnl
22		AX_SAVE_FLAGS
	22	VLC_SAVE_FLAGS
23	23
24	24	dnl
…	…
94	94	dnl
95	95	LDFLAGS_vlc="${LDFLAGS}"
96		~~LIBEXT=".so"~~
97	96
98	97	dnl
…	…
109	108	SYS=bsdi
110	109	CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
111		AX_ADD_LDFLAGS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd])
	110	VLC_ADD_LDFLAGS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd])
112	111	;;
113	112	bsd)
…	…
120	119	CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
121	120	OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}"
122		AX_ADD_LDFLAGS([vlc ffmpeg],[-all_load])
123		AX_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation])
124		AX_ADD_LDFLAGS([vlc],[-Wl,-multiply_defined,suppress])
125		LIBEXT=".dylib"
	121	VLC_ADD_LDFLAGS([vlc ffmpeg],[-all_load])
	122	VLC_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation])
	123	VLC_ADD_LDFLAGS([vlc],[-Wl,-multiply_defined,suppress])
126	124	;;
127	125	mingw32 \| cygwin)
128	126	AC_CHECK_TOOL(WINDRES, windres, :)
129		~~LIBEXT=".dll"~~
130	127
131	128	case "${target_os}" in
…	…
147	144	# add ws2_32 for closesocket, select, recv
148	145	CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
149		AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
150		AX_ADD_LDFLAGS([vcdx cddax],[-lwinmm])
151		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])
	146	VLC_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
	147	VLC_ADD_LDFLAGS([vcdx cddax],[-lwinmm])
	148	VLC_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])
152	149	fi
153	150	;;
154	151	nto)
155	152	SYS=nto
156		AX_ADD_LDFLAGS([x11 xvideo],[-lsocket])
	153	VLC_ADD_LDFLAGS([x11 xvideo],[-lsocket])
157	154	;;
158	155	solaris*)
…	…
164	161	hpux*)
165	162	SYS=hpux
166		~~LIBEXT=".sl"~~
167	163	;;
168	164	beos)
…	…
170	166	CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
171	167	CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
172		AX_ADD_CXXFLAGS([beos],[])
173		AX_ADD_LDFLAGS([vlc beos],[-lbe])
174		AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
	168	VLC_ADD_CXXFLAGS([beos],[])
	169	VLC_ADD_LDFLAGS([vlc beos],[-lbe])
	170	VLC_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
175	171
176	172	dnl Ugly check for Zeta
177	173	if test -f /boot/beos/system/lib/libzeta.so; then
178		AX_ADD_LDFLAGS([beos],[-lzeta])
	174	VLC_ADD_LDFLAGS([beos],[-lzeta])
179	175	fi
180	176	;;
…	…
199	195	AC_CHECK_FUNCS(textdomain,,[
200	196	AC_CHECK_LIB(intl,textdomain,
201		AX_ADD_LDFLAGS([vlc],[${LIBINTL}]),,
	197	VLC_ADD_LDFLAGS([vlc],[${LIBINTL}]),,
202	198	${LIBINTL}
203	199	)
…	…
215	211	fi
216	212
217		~~AC_MSG_CHECKING(for suffix of libraries)~~
218		~~AC_MSG_RESULT(${LIBEXT})~~
219
220	213	dnl Check for the need to include the mingwex lib for mingw32
221	214	if test "${SYS}" = "mingw32"
222	215	then
223	216	AC_CHECK_LIB(mingwex,opendir,
224		AC_CHECK_LIB(mingw32,opendir,AX_ADD_LDFLAGS([vlc],[]),
225		[AX_ADD_LDFLAGS([vlc gtk],[-lmingwex])])
	217	AC_CHECK_LIB(mingw32,opendir,VLC_ADD_LDFLAGS([vlc],[]),
	218	[VLC_ADD_LDFLAGS([vlc gtk],[-lmingwex])])
226	219	)
227	220	fi
…	…
268	261	fi
269	262
270		dnl Flags for plugin compilation
	263	dnl Plugin compilation stuff
	264
	265	VLC_LIBRARY_SUFFIX
	266
271	267	case "${SYS}" in
272	268	mingw32\|cygwin)
273		AX_ADD_CFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}])
274		AX_ADD_CXXFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}])
275		AX_ADD_OBJCFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}])
	269	VLC_ADD_CFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}])
	270	VLC_ADD_CXXFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}])
	271	VLC_ADD_OBJCFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}])
276	272	;;
277	273	*)
278		AX_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC])
279		AX_ADD_CXXFLAGS([pic plugin mozilla],[-fpic -fPIC])
280		AX_ADD_OBJCFLAGS([pic plugin mozilla],[-fpic -fPIC])
281		AX_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC])
	274	VLC_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC])
	275	VLC_ADD_CXXFLAGS([pic plugin mozilla],[-fpic -fPIC])
	276	VLC_ADD_OBJCFLAGS([pic plugin mozilla],[-fpic -fPIC])
	277	VLC_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC])
282	278	;;
283	279	esac
…	…
315	311	AC_CHECK_FUNCS(connect,,[
316	312	AC_CHECK_LIB(socket,connect,[
317		AX_ADD_LDFLAGS([vlc ipv4 cddax],-lsocket)
	313	VLC_ADD_LDFLAGS([vlc ipv4 cddax],-lsocket)
318	314	])
319	315	])
…	…
321	317	AC_CHECK_FUNCS(send,,[
322	318	AC_CHECK_LIB(socket,send,[
323		AX_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard],[-lsocket])
	319	VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard],[-lsocket])
324	320	])
325	321	])
…	…
327	323	AC_CHECK_FUNCS(gethostbyname,,[
328	324	AC_CHECK_LIB(nsl,gethostbyname,[
329		AX_ADD_LDFLAGS([cddax ipv4 vlc],[-lnsl])
	325	VLC_ADD_LDFLAGS([cddax ipv4 vlc],[-lnsl])
330	326	],[
331	327	AC_CHECK_LIB(bind,gethostbyname,[
332		AX_ADD_LDFLAGS([ipv4 access_mms],[-lbind])
	328	VLC_ADD_LDFLAGS([ipv4 access_mms],[-lbind])
333	329	])
334	330	])
…	…
369	365	AC_CHECK_FUNCS(inet_aton,,[
370	366	AC_CHECK_LIB(resolv,inet_aton,[
371		AX_ADD_LDFLAGS([ipv4 vlc],[-lresolv])
	367	VLC_ADD_LDFLAGS([ipv4 vlc],[-lresolv])
372	368	])
373	369	])
…	…
382	378	AC_CHECK_LIB([gnugetopt],[getopt_long],
383	379	[AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support)
384		AX_ADD_LDFLAGS([vlc],[-lgnugetopt])],
	380	VLC_ADD_LDFLAGS([vlc],[-lgnugetopt])],
385	381	[need_getopt=:])])
386	382	fi
…	…
390	386	AC_TYPE_SIGNAL
391	387	AC_CHECK_LIB(m,cos,[
392		AX_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32],[-lm])
	388	VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32],[-lm])
393	389	])
394	390	AC_CHECK_LIB(m,pow,[
395		AX_ADD_LDFLAGS([ffmpeg stream_out_transcode stream_out_transrate i420_rgb faad vlc],[-lm])
	391	VLC_ADD_LDFLAGS([ffmpeg stream_out_transcode stream_out_transrate i420_rgb faad vlc],[-lm])
396	392	])
397	393	AC_CHECK_LIB(m,sqrt,[
398		AX_ADD_LDFLAGS([headphone_channel_mixer],[-lm])
	394	VLC_ADD_LDFLAGS([headphone_channel_mixer],[-lm])
399	395	])
400	396	fi # end "${SYS}" != "mingw32"
…	…
417	413	AC_CHECK_LIB(dld, shl_load,
418	414	[ac_cv_my_have_shl_load=yes
419		AX_ADD_LDFLAGS([vlc],[-ldld])])])
	415	VLC_ADD_LDFLAGS([vlc],[-ldld])])])
420	416	if test "${ac_cv_my_have_shl_load}" = "yes"; then
421	417	AC_DEFINE(HAVE_DL_SHL_LOAD, 1, [Define if you have the shl_load API])
…	…
427	423	if test "${ac_cv_have_plugins}" = "no"; then
428	424	AC_CHECK_LIB(dld, dld_link,
429		[AX_ADD_LDFLAGS([vlc],[-ldld])
	425	[VLC_ADD_LDFLAGS([vlc],[-ldld])
430	426	AC_DEFINE(HAVE_DL_DLD_LINK, 1, [Define if you have the GNU dld library])
431	427	ac_cv_have_plugins=yes])
…	…
436	432	if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
437	433	AC_CHECK_LIB(kernel32, main,
438		[AX_ADD_LDFLAGS([vlc],[-lkernel32])
	434	[VLC_ADD_LDFLAGS([vlc],[-lkernel32])
439	435	AC_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary])
440	436	ac_cv_have_plugins=yes])
…	…
458	454	AC_CHECK_LIB(dl, dlopen,
459	455	ac_cv_my_have_dlopen=yes
460		AX_ADD_LDFLAGS([vlc],[-ldl]),
	456	VLC_ADD_LDFLAGS([vlc],[-ldl]),
461	457	AC_CHECK_LIB(svld, dlopen,
462	458	ac_cv_my_have_dlopen=yes
463		AX_ADD_LDFLAGS([vlc],[-lsvld]))))
	459	VLC_ADD_LDFLAGS([vlc],[-lsvld]))))
464	460	if test "${ac_cv_my_have_dlopen}" = "yes"; then
465	461	AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API])
…	…
526	522	])
527	523
528		AX_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}])
	524	VLC_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}])
529	525
530	526	dnl Don't link with rt when using GNU-pth
531	527	if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then
532	528	dnl HP/UX port
533		AC_CHECK_LIB(rt,sem_init, [AX_ADD_LDFLAGS([vlc],[-lrt])])
	529	AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])])
534	530
535	531	have_nanosleep=false
536	532	AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
537	533	AC_CHECK_LIB(rt,nanosleep,
538		[AX_ADD_LDFLAGS([vlc],[-lrt]) have_nanosleep=:],
	534	[VLC_ADD_LDFLAGS([vlc],[-lrt]) have_nanosleep=:],
539	535	[AC_CHECK_LIB(posix4,nanosleep,
540		[AX_ADD_LDFLAGS([vlc],[-lposix4]) have_nanosleep=:])]
	536	[VLC_ADD_LDFLAGS([vlc],[-lposix4]) have_nanosleep=:])]
541	537	)
542	538	])
…	…
779	775	CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
780	776	# this plugin does not compile without -fomit-frame-pointer, damn gcc!
781		AX_ADD_CFLAGS([i420_yuy2_mmx],[-fomit-frame-pointer])
	777	VLC_ADD_CFLAGS([i420_yuy2_mmx],[-fomit-frame-pointer])
782	778	fi
783	779
…	…
788	784	AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)])
789	785	if test "${ac_cv_c_dynamic_no_pic}" != "no"; then
790		AX_ADD_CFLAGS([builtin],[-mdynamic-no-pic])
791		AX_ADD_CFLAGS([libvlc],[-mdynamic-no-pic])
	786	VLC_ADD_CFLAGS([builtin],[-mdynamic-no-pic])
	787	VLC_ADD_CFLAGS([libvlc],[-mdynamic-no-pic])
792	788	fi
793	789
…	…
798	794	AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)])
799	795	if test "${ac_cv_ld_darwin}" != "no"; then
800		AX_ADD_LDFLAGS([plugin],[-bundle -undefined error -lcc_dynamic])
	796	VLC_ADD_LDFLAGS([plugin],[-bundle -undefined error -lcc_dynamic])
801	797	fi
802	798
…	…
804	800	dnl BeOS' gcc needs -nostart instead of -shared, even if -shared isn't harmful (just a warning)
805	801	if test "${SYS}" = "beos"; then
806		AX_ADD_LDFLAGS([plugin mozilla],[-nostart])
	802	VLC_ADD_LDFLAGS([plugin mozilla],[-nostart])
807	803	else
808	804	AC_CACHE_CHECK([if \$CC accepts -shared],
…	…
811	807	AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
812	808	if test "${ac_cv_ld_plugins}" != "no"; then
813		AX_ADD_LDFLAGS([plugin mozilla],[-shared])
	809	VLC_ADD_LDFLAGS([plugin mozilla],[-shared])
814	810	fi
815	811	fi
…	…
893	889	dnl default modules
894	890	dnl
895		AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync])
896		AX_ADD_PLUGINS([mpgv mpga m4v h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg])
897		AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
898		AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
899		AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
900		AX_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler])
901		AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer])
902		AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
903		AX_ADD_PLUGINS([aout_file])
904		AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
905		AX_ADD_PLUGINS([m3u playlist export sgimb])
906		AX_ADD_PLUGINS([rawvideo])
907		AX_ADD_PLUGINS([wav araw demuxsub adpcm a52sys dtssys au])
908		AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
909		AX_ADD_PLUGINS([access_ftp access_directory sap http])
	891	VLC_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync])
	892	VLC_ADD_PLUGINS([mpgv mpga m4v h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg])
	893	VLC_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
	894	VLC_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
	895	VLC_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
	896	VLC_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler])
	897	VLC_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer])
	898	VLC_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
	899	VLC_ADD_PLUGINS([aout_file])
	900	VLC_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
	901	VLC_ADD_PLUGINS([m3u playlist export sgimb])
	902	VLC_ADD_PLUGINS([rawvideo])
	903	VLC_ADD_PLUGINS([wav araw demuxsub adpcm a52sys dtssys au])
	904	VLC_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
	905	VLC_ADD_PLUGINS([access_ftp access_directory sap http])
910	906
911	907	dnl
…	…
915	911	[ --enable-mostly-builtin most modules will be built-in (default disabled)])
916	912	if test "${enable_mostly_builtin}" = "yes"; then
917		AX_ADD_BUILTINS([${PLUGINS}])
	913	VLC_ADD_BUILTINS([${PLUGINS}])
918	914	PLUGINS=""
919	915	fi
…	…
923	919	dnl
924	920	if test "${SYS}" != "mingw32"; then
925		AX_ADD_PLUGINS([screensaver])
	921	VLC_ADD_PLUGINS([screensaver])
926	922	else
927		AX_ADD_PLUGINS([ntservice])
	923	VLC_ADD_PLUGINS([ntservice])
928	924	fi
929	925
…	…
999	995	AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.)
1000	996	if test "${ac_cv_altivec_inline}" != "yes"; then
1001		AX_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}])
1002		AX_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}])
1003		AX_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}])
1004		AX_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
1005		AX_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}])
	997	VLC_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}])
	998	VLC_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}])
	999	VLC_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}])
	1000	VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
	1001	VLC_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}])
1006	1002	fi
1007	1003	ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
…	…
1035	1031	if test "${ac_cv_c_altivec}" != "no"; then
1036	1032	AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
1037		AX_ADD_CFLAGS([vlc idctaltivec motionaltivec memcpyaltivec deinterlace i420_yuy2_altivec],[${ac_cv_c_altivec}])
	1033	VLC_ADD_CFLAGS([vlc idctaltivec motionaltivec memcpyaltivec deinterlace i420_yuy2_altivec],[${ac_cv_c_altivec}])
1038	1034	ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
1039	1035	fi
…	…
1046	1042	])
1047	1043	if test "${ac_cv_ld_altivec}" != "no"; then
1048		AX_ADD_LDFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib])
	1044	VLC_ADD_LDFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib])
1049	1045	fi
1050	1046	fi # end "${SYS}" != "mingw32"
…	…
1079	1075	then
1080	1076	ARCH="${ARCH} mmx"
1081		AX_ADD_BUILTINS([${ACCEL_MODULES}])
	1077	VLC_ADD_BUILTINS([${ACCEL_MODULES}])
1082	1078	fi
1083	1079
…	…
1095	1091	[ --disable-altivec disable AltiVec optimizations (default enabled on PPC)],
1096	1092	[ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec";
1097		AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi ],
	1093	VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ],
1098	1094	[ if test "${target_cpu}" = "powerpc"; then ARCH="${ARCH} altivec";
1099		AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi ])
	1095	VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ])
1100	1096
1101	1097	dnl
…	…
1120	1116	if test "${enable_sout}" != "no"
1121	1117	then
1122		AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http])
1123		AX_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy])
1124		AX_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264])
1125		AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
1126		AX_ADD_PLUGINS([packetizer_copy])
1127
1128		AX_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp])
1129		AX_ADD_PLUGINS([stream_out_duplicate stream_out_gather])
1130		# AX_ADD_PLUGINS([stream_out_transrate stream_out_display])
	1118	VLC_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http])
	1119	VLC_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy])
	1120	VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264])
	1121	VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
	1122	VLC_ADD_PLUGINS([packetizer_copy])
	1123
	1124	VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp])
	1125	VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather])
	1126	# VLC_ADD_PLUGINS([stream_out_transrate stream_out_display])
1131	1127
1132	1128	dnl Ogg and vorbis are handled in their respective section
…	…
1158	1154	CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_livedotcom}"
1159	1155	AC_CHECK_HEADERS(liveMedia.hh, [
1160		AX_ADD_CXXFLAGS([livedotcom], [${CPPFLAGS_livedotcom}])
	1156	VLC_ADD_CXXFLAGS([livedotcom], [${CPPFLAGS_livedotcom}])
1161	1157	AC_CHECK_LIB(liveMedia_pic, main, [
1162	1158	# We have -lliveMedia_pic, build plugins
1163		AX_ADD_PLUGINS([livedotcom])
1164		AX_ADD_LDFLAGS([livedotcom], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
	1159	VLC_ADD_PLUGINS([livedotcom])
	1160	VLC_ADD_LDFLAGS([livedotcom], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
1165	1161	], [
1166	1162	AC_CHECK_LIB(liveMedia, main, [
1167	1163	# We only have -lliveMedia, do builtins
1168		AX_ADD_BUILTINS([livedotcom])
1169		AX_ADD_LDFLAGS([livedotcom], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
	1164	VLC_ADD_BUILTINS([livedotcom])
	1165	VLC_ADD_LDFLAGS([livedotcom], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
1170	1166	])
1171	1167	])
1172	1168	if test "${SYS}" = "mingw32"; then
1173	1169	# add ws2_32 for closesocket, select, recv
1174		AX_ADD_LDFLAGS([livedotcom],[-lws2_32])
	1170	VLC_ADD_LDFLAGS([livedotcom],[-lws2_32])
1175	1171	fi
1176	1172	])
…	…
1188	1184	AC_MSG_RESULT(${real_livedotcom_tree}/liveMedia/libliveMedia.a)
1189	1185
1190		AX_ADD_BUILTINS([livedotcom])
	1186	VLC_ADD_BUILTINS([livedotcom])
1191	1187
1192	1188	if test "${SYS}" = "mingw32"; then
1193	1189	# add ws2_32 for closesocket, select, recv
1194		AX_ADD_LDFLAGS([livedotcom],[-lws2_32])
	1190	VLC_ADD_LDFLAGS([livedotcom],[-lws2_32])
1195	1191	fi
1196	1192
1197		AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/liveMedia -lliveMedia])
1198		AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
1199		AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/groupsock -lgroupsock])
1200		AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/UsageEnvironment -lUsageEnvironment])
1201
1202		AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/BasicUsageEnvironment/include])
1203		AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/groupsock/include])
1204		AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/liveMedia/include])
1205		AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/UsageEnvironment/include ])
	1193	VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/liveMedia -lliveMedia])
	1194	VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
	1195	VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/groupsock -lgroupsock])
	1196	VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/UsageEnvironment -lUsageEnvironment])
	1197
	1198	VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/BasicUsageEnvironment/include])
	1199	VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/groupsock/include])
	1200	VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/liveMedia/include])
	1201	VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/UsageEnvironment/include ])
1206	1202	else
1207	1203	dnl The given live.com wasn't built
…	…
1229	1225	then
1230	1226	AC_CHECK_HEADERS(dvdread/dvd_reader.h,
1231		[ AX_ADD_PLUGINS([dvdread])
1232		AX_ADD_LDFLAGS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}])
	1227	[ VLC_ADD_PLUGINS([dvdread])
	1228	VLC_ADD_LDFLAGS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}])
1233	1229	],[
1234	1230	if test -n "${enable_dvdread}"
…	…
1251	1247	dnl Use a custom libdvdread
1252	1248	AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
1253		AX_ADD_BUILTINS([dvdread])
1254		AX_ADD_LDFLAGS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}])
1255		AX_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}])
	1249	VLC_ADD_BUILTINS([dvdread])
	1250	VLC_ADD_LDFLAGS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}])
	1251	VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}])
1256	1252	else
1257	1253	dnl The given libdvdread wasn't built
…	…
1266	1262	dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h
1267	1263	AC_MSG_RESULT(yes)
1268		AX_ADD_PLUGINS([dvdread])
1269		AX_ADD_LDFLAGS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}])
1270		AX_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include])
	1264	VLC_ADD_PLUGINS([dvdread])
	1265	VLC_ADD_LDFLAGS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}])
	1266	VLC_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include])
1271	1267	else
1272	1268	dnl No libdvdread could be found, sorry
…	…
1294	1290	if test "${DVDNAV_CONFIG}" != "no"
1295	1291	then
1296		AX_ADD_PLUGINS([dvdnav])
1297		AX_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`])
1298		AX_ADD_LDFLAGS([dvdnav],[`${DVDNAV_CONFIG} --libs`])
	1292	VLC_ADD_PLUGINS([dvdnav])
	1293	VLC_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`])
	1294	VLC_ADD_LDFLAGS([dvdnav],[`${DVDNAV_CONFIG} --libs`])
1299	1295	fi
1300	1296	fi
…	…
1310	1306	then
1311	1307	AC_CHECK_HEADERS(dshow.h,
1312		[ AX_ADD_PLUGINS([dshow])
1313		AX_ADD_CXXFLAGS([dshow],[])
1314		AX_ADD_LDFLAGS([dshow],[-lole32 -loleaut32]) ])
	1308	[ VLC_ADD_PLUGINS([dshow])
	1309	VLC_ADD_CXXFLAGS([dshow],[])
	1310	VLC_ADD_LDFLAGS([dshow],[-lole32 -loleaut32]) ])
1315	1311	fi
1316	1312	fi
…	…
1332	1328	then
1333	1329	AC_CHECK_HEADERS(dvbpsi/dr.h,
1334		[ AX_ADD_PLUGINS([mux_ts ts])
1335		AX_ADD_LDFLAGS([mux_ts ts],[-ldvbpsi]) ],
	1330	[ VLC_ADD_PLUGINS([mux_ts ts])
	1331	VLC_ADD_LDFLAGS([mux_ts ts],[-ldvbpsi]) ],
1336	1332	[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
1337	1333	[#if defined( HAVE_STDINT_H )
…	…
1357	1353	dnl Use a custom libdvbpsi
1358	1354	AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
1359		AX_ADD_BUILTINS([mux_ts ts])
1360		AX_ADD_CPPFLAGS([mux_ts ts],[-I${real_dvbpsi_tree}/src])
1361		AX_ADD_LDFLAGS([mux_ts ts],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi])
	1355	VLC_ADD_BUILTINS([mux_ts ts])
	1356	VLC_ADD_CPPFLAGS([mux_ts ts],[-I${real_dvbpsi_tree}/src])
	1357	VLC_ADD_LDFLAGS([mux_ts ts],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi])
1362	1358	else
1363	1359	dnl The given libdvbpsi wasn't built
…	…
1382	1378	CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
1383	1379	AC_CHECK_HEADERS([dvbpsi/dr.h],[
1384		AX_ADD_PLUGINS([mux_ts ts])
1385		AX_ADD_CPPFLAGS([mux_ts ts],[${CPPFLAGS_test}])
1386		AX_ADD_LDFLAGS([mux_ts ts],[${LDFLAGS_test} -ldvbpsi])
	1380	VLC_ADD_PLUGINS([mux_ts ts])
	1381	VLC_ADD_CPPFLAGS([mux_ts ts],[${CPPFLAGS_test}])
	1382	VLC_ADD_LDFLAGS([mux_ts ts],[${LDFLAGS_test} -ldvbpsi])
1387	1383
1388	1384	],[
…	…
1408	1404	if test "${with_v4l}" != "no" -a -n "${with_v4l}"
1409	1405	then
1410		AX_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include])
	1406	VLC_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include])
1411	1407	fi
1412	1408
1413	1409	CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l}"
1414	1410	AC_CHECK_HEADERS(linux/videodev.h, [
1415		AX_ADD_PLUGINS([v4l])
	1411	VLC_ADD_PLUGINS([v4l])
1416	1412	],[])
1417	1413	CPPFLAGS="${CPPFLAGS_save}"
…	…
1425	1421	if test "${enable_pvr}" = "yes"
1426	1422	then
1427		AX_ADD_PLUGINS([pvr])
	1423	VLC_ADD_PLUGINS([pvr])
1428	1424	fi
1429	1425
…	…
1451	1447	dnl [enable_cddax="no"
1452	1448	dnl AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
1453		dnl AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
1454		dnl AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
1455		dnl AX_ADD_PLUGINS([cddax])],
	1449	dnl VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
	1450	dnl VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
	1451	dnl VLC_ADD_PLUGINS([cddax])],
1456	1452	dnl [AC_MSG_WARN(libcdio library not found)
1457	1453	dnl HAVE_CDDAX=no])
1458	1454	dnl
1459		dnl if test ~~x$enable_libcddb != no~~; then
	1455	dnl if test "$enable_libcddb" != "no"; then
1460	1456	dnl PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
1461	1457	dnl HAVE_LIBCDDB=yes
1462	1458	dnl AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
1463		dnl AX_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
1464		dnl AX_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
	1459	dnl VLC_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
	1460	dnl VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
1465	1461	dnl ],
1466	1462	dnl [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled)
…	…
1474	1470	dnl AC_DEFINE(HAVE_VCDX, [],
1475	1471	dnl [Define for the VCD plugin using libcdio/libvcdinfo])
1476		dnl AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
1477		dnl AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
1478		dnl AX_ADD_PLUGINS([vcdx])],
	1472	dnl VLC_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
	1473	dnl VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
	1474	dnl VLC_ADD_PLUGINS([vcdx])],
1479	1475	dnl [AC_MSG_WARN(vcdinfo library not found)
1480	1476	dnl HAVE_VCDX=no])
…	…
1493	1489	AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
1494	1490	AC_MSG_RESULT(yes)
1495		AX_ADD_PLUGINS([vcd cdda])
	1491	VLC_ADD_PLUGINS([vcd cdda])
1496	1492	],[
1497	1493	AC_MSG_RESULT(no)
…	…
1501	1497	AC_EGREP_HEADER(scsireq,sys/scsiio.h,[
1502	1498	AC_MSG_RESULT(yes)
1503		AX_ADD_PLUGINS([vcd cdda])
	1499	VLC_ADD_PLUGINS([vcd cdda])
1504	1500	AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support)
1505	1501	],[
…	…
1510	1506	AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[
1511	1507	AC_MSG_RESULT(yes)
1512		AX_ADD_PLUGINS([vcd cdda])
	1508	VLC_ADD_PLUGINS([vcd cdda])
1513	1509	AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support)
1514	1510	],[
…	…
1518	1514	if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32"
1519	1515	then
1520		AX_ADD_PLUGINS([vcd cdda])
	1516	VLC_ADD_PLUGINS([vcd cdda])
1521	1517	fi
1522	1518
1523	1519	if test "${SYS}" = "darwin"
1524	1520	then
1525		AX_ADD_PLUGINS([vcd cdda])
1526		AX_ADD_LDFLAGS([vcd vcdx cdda],[-framework IOKit -framework CoreFoundation])
	1521	VLC_ADD_PLUGINS([vcd cdda])
	1522	VLC_ADD_LDFLAGS([vcd vcdx cdda],[-framework IOKit -framework CoreFoundation])
1527	1523	fi
1528	1524	fi
…	…
1537	1533	AC_DEFINE(HAVE_SATELLITE, [],
1538	1534	[Define for the VCD plugin using libcdio/libvcdinfo])
1539		AX_ADD_PLUGINS([satellite])
	1535	VLC_ADD_PLUGINS([satellite])
1540	1536	fi])
1541	1537
…	…
1552	1548	if test "${with_dvb}" != "no" -a -n "${with_dvb}"
1553	1549	then
1554		AX_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
	1550	VLC_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
1555	1551	fi
1556	1552	CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include"
1557	1553	AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [
1558		AX_ADD_PLUGINS([dvb])
	1554	VLC_ADD_PLUGINS([dvb])
1559	1555	],[])
1560	1556	CPPFLAGS="${CPPFLAGS_save}"
…	…
1570	1566	AC_CHECK_LIB(resolv,inet_pton,
1571	1567	[have_ipv6=:
1572		AX_ADD_LDFLAGS([ipv6],[-lresolv])])
	1568	VLC_ADD_LDFLAGS([ipv6],[-lresolv])])
1573	1569	])
1574	1570	AC_MSG_CHECKING(for sockaddr_in6 in netinet/in.h)
…	…
1576	1572	[AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) have_ipv6=false])
1577	1573	if ${have_ipv6}; then
1578		AX_ADD_PLUGINS([ipv6])
	1574	VLC_ADD_PLUGINS([ipv6])
1579	1575	fi
1580	1576	fi
…	…
1583	1579	AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h)
1584	1580	AC_EGREP_HEADER(addrinfo,ws2tcpip.h,[AC_MSG_RESULT(yes)
1585		AX_ADD_PLUGINS([ipv6])],[AC_MSG_RESULT(no)])
	1581	VLC_ADD_PLUGINS([ipv6])],[AC_MSG_RESULT(no)])
1586	1582	fi
1587	1583
…	…
1595	1591	AC_CHECK_HEADERS(ogg/ogg.h, [
1596	1592	AC_CHECK_LIB( ogg, oggpack_read, [
1597		AX_ADD_PLUGINS([ogg mux_ogg])
1598		AX_ADD_LDFLAGS([ogg mux_ogg],[-logg])])
	1593	VLC_ADD_PLUGINS([ogg mux_ogg])
	1594	VLC_ADD_LDFLAGS([ogg mux_ogg],[-logg])])
1599	1595	],[])
1600	1596	fi
…	…
1610	1606	AC_CHECK_HEADERS(matroska/KaxVersion.h, [
1611	1607	AC_CHECK_HEADERS(matroska/KaxAttachments.h)
1612		AX_ADD_CXXFLAGS([mkv],[])
	1608	VLC_ADD_CXXFLAGS([mkv],[])
1613	1609	AC_CHECK_LIB(ebml_pic, main, [
1614	1610	# We have ebml_pic, that's good, we can build an mkv.so plugin !
1615		AX_ADD_PLUGINS([mkv])
1616		AX_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
	1611	VLC_ADD_PLUGINS([mkv])
	1612	VLC_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
1617	1613	], [
1618	1614	AC_CHECK_LIB(ebml, main, [
1619	1615	# We only have libebml, make mkv.a a builtin
1620		AX_ADD_BUILTINS([mkv])
1621		AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
	1616	VLC_ADD_BUILTINS([mkv])
	1617	VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
1622	1618	])
1623	1619	])
…	…
1635	1631	then
1636	1632	AC_CHECK_HEADERS(libmodplug/modplug.h, [
1637		AX_ADD_PLUGINS([mod])
1638		AX_ADD_CXXFLAGS([mod],[])
1639		AX_ADD_LDFLAGS([mod],[-lmodplug])])
	1633	VLC_ADD_PLUGINS([mod])
	1634	VLC_ADD_CXXFLAGS([mod],[])
	1635	VLC_ADD_LDFLAGS([mod],[-lmodplug])])
1640	1636	fi
1641	1637
…	…
1657	1653	if test "${with_mad}" != "no" -a -n "${with_mad}"
1658	1654	then
1659		AX_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
1660		AX_ADD_LDFLAGS([mpgatofixed32],[-L${with_mad}/lib])
	1655	VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
	1656	VLC_ADD_LDFLAGS([mpgatofixed32],[-L${with_mad}/lib])
1661	1657	fi
1662	1658
…	…
1677	1673	then
1678	1674	AC_MSG_RESULT(yes)
1679		AX_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}])
1680		AX_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/.libs])
	1675	VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}])
	1676	VLC_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/.libs])
1681	1677	LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}"
1682	1678	AC_CHECK_LIB(mad, mad_bit_init, [
1683		AX_ADD_BUILTINS([mpgatofixed32])
1684		AX_ADD_LDFLAGS([mpgatofixed32],[-lmad])
	1679	VLC_ADD_BUILTINS([mpgatofixed32])
	1680	VLC_ADD_LDFLAGS([mpgatofixed32],[-lmad])
1685	1681	],[ AC_MSG_ERROR([the specified tree hasn't been compiled ])
1686	1682	],[])
…	…
1696	1692	[ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ])
1697	1693	AC_CHECK_LIB(mad, mad_bit_init, [
1698		AX_ADD_PLUGINS([mpgatofixed32])
1699		AX_ADD_LDFLAGS([mpgatofixed32],[-lmad])],
	1694	VLC_ADD_PLUGINS([mpgatofixed32])
	1695	VLC_ADD_LDFLAGS([mpgatofixed32],[-lmad])],
1700	1696	[ AC_MSG_ERROR([Cannot find libmad library...]) ])
1701	1697	CPPFLAGS="${CPPFLAGS_save}"
…	…
1709	1705	dnl AC_CHECK_HEADERS(id3tag.h, [
1710	1706	dnl AC_CHECK_HEADERS(zlib.h, [
1711		dnl AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
1712		dnl AX_ADD_PLUGINS([id3tag])]) ])
	1707	dnl VLC_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
	1708	dnl VLC_ADD_PLUGINS([id3tag])]) ])
1713	1709
1714	1710	dnl
…	…
1724	1720	dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
1725	1721	dnl linker would miserably barf on multiple definitions.
1726		AX_ADD_LDFLAGS([stream_out_transcode],[])
1727		AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
	1722	VLC_ADD_LDFLAGS([stream_out_transcode],[])
	1723	VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
1728	1724
1729	1725	AC_ARG_WITH(ffmpeg-faac,
…	…
1732	1728	dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
1733	1729	dnl linker would miserably barf on multiple definitions.
1734		AX_ADD_LDFLAGS([stream_out_transcode],[])
1735		AX_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
	1730	VLC_ADD_LDFLAGS([stream_out_transcode],[])
	1731	VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
1736	1732
1737	1733	AC_ARG_WITH(ffmpeg-tree,
…	…
1747	1743	AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
1748	1744	AC_CHECK_LIB(avcodec, avcodec_init, [
1749		AX_ADD_BUILTINS([ffmpeg stream_out_transcode])
1750		AX_ADD_LDFLAGS([ffmpeg],[-lavcodec])
	1745	VLC_ADD_BUILTINS([ffmpeg stream_out_transcode])
	1746	VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])
1751	1747	dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
1752	1748	dnl linker would miserably barf on multiple definitions.
1753		AX_ADD_LDFLAGS([stream_out_transcode],[]) ],
	1749	VLC_ADD_LDFLAGS([stream_out_transcode],[]) ],
1754	1750	[ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ])
1755	1751	AC_CHECK_LIB(avformat, av_open_input_stream, [
1756	1752	AC_DEFINE(HAVE_LIBAVFORMAT, 1,
1757	1753	[Define if you have ffmpeg's libavformat.])
1758		AX_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ])
	1754	VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ])
1759	1755	LDFLAGS="${LDFLAGS_save}"
1760	1756	CPPFLAGS="${CPPFLAGS_save}"
…	…
1784	1780	dnl Use a custom libffmpeg
1785	1781	AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
1786		AX_ADD_BUILTINS([ffmpeg stream_out_transcode])
1787		AX_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec])
1788		AX_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
	1782	VLC_ADD_BUILTINS([ffmpeg stream_out_transcode])
	1783	VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec])
	1784	VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
1789	1785
1790	1786	if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
1791	1787	AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.])
1792		AX_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat -lavformat -lz])
1793		AX_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavformat])
	1788	VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat -lavformat -lz])
	1789	VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavformat])
1794	1790	fi
1795	1791
1796	1792	dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
1797	1793	dnl linker would miserably barf on multiple definitions.
1798		AX_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec])
1799		AX_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
	1794	VLC_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec])
	1795	VLC_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
1800	1796	fi
1801	1797	fi
…	…
1824	1820	dnl Use a custom faad
1825	1821	AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
1826		AX_ADD_BUILTINS([faad])
1827		AX_ADD_LDFLAGS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a])
1828		AX_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include])
	1822	VLC_ADD_BUILTINS([faad])
	1823	VLC_ADD_LDFLAGS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a])
	1824	VLC_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include])
1829	1825	else
1830	1826	dnl The given libfaad wasn't built
…	…
1838	1834	[ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ])
1839	1835	AC_CHECK_LIB(faad, faacDecOpen, [
1840		AX_ADD_PLUGINS([faad])
1841		AX_ADD_LDFLAGS([faad],[-lfaad]) ],
	1836	VLC_ADD_PLUGINS([faad])
	1837	VLC_ADD_LDFLAGS([faad],[-lfaad]) ],
1842	1838	AC_CHECK_LIB(faad, NeAACDecOpen, [
1843		AX_ADD_PLUGINS([faad])
1844		AX_ADD_LDFLAGS([faad],[-lfaad]) ],
	1839	VLC_ADD_PLUGINS([faad])
	1840	VLC_ADD_LDFLAGS([faad],[-lfaad]) ],
1845	1841	[ AC_MSG_ERROR([Cannot find libfaad library...]) ]))
1846	1842	LDFLAGS="${LDFLAGS_save}"
…	…
1861	1857	dnl if test "${with_xvid}" != "no" -a -n "${with_xvid}"
1862	1858	dnl then
1863		dnl AX_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include])
1864		dnl AX_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib])
	1859	dnl VLC_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include])
	1860	dnl VLC_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib])
1865	1861	dnl fi
1866	1862	dnl
…	…
1881	1877	dnl dnl Use a custom xvid
1882	1878	dnl AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
1883		dnl AX_ADD_BUILTINS([xvid])
1884		dnl AX_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore])
1885		dnl AX_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src])
	1879	dnl VLC_ADD_BUILTINS([xvid])
	1880	dnl VLC_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore])
	1881	dnl VLC_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src])
1886	1882	dnl else
1887	1883	dnl dnl The given libxvidcore wasn't built
…	…
1895	1891	dnl [ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
1896	1892	dnl AC_CHECK_LIB(xvidcore, xvid_init, [
1897		dnl AX_ADD_PLUGINS([xvid])
1898		dnl AX_ADD_LDFLAGS([xvid],[-lxvidcore]) ],
	1893	dnl VLC_ADD_PLUGINS([xvid])
	1894	dnl VLC_ADD_LDFLAGS([xvid],[-lxvidcore]) ],
1899	1895	dnl [ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
1900	1896	dnl LDFLAGS="${LDFLAGS_save}"
…	…