Navigation

Changeset ceb76725a3e379b337fada346417818030b497c2

Timestamp:

06/03/08 21:58:00 (3 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1212523080 +0200

git-parent:

[f9dcddd88db1da17054b2eb2285ac7126772e38c]

git-author:

Rafaël Carré <funman@videolan.org> 1212523051 +0200

Message:

Link with libavutil when needed

Use tabs in Makefile

Files:

rf9dcddd	rceb7672
2926	2926	if test "${enable_avcodec}" != "no"
2927	2927	then
2928		PKG_CHECK_MODULES(AVCODEC,[libavcodec],
	2928	PKG_CHECK_MODULES(AVCODEC,[libavcodec libavutil],
2929	2929	[
2930	2930	VLC_SAVE_FLAGS
…	…
2932	2932	CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
2933	2933	AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h)
	2934	AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
2934	2935	VLC_ADD_PLUGIN([avcodec])
2935	2936	VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
…	…
2937	2938	VLC_RESTORE_FLAGS
2938	2939	],[
2939		AC_MSG_ERROR([Could not find libavcodec. Use --disable-avcodec to ignore this error.])
	2940	AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
2940	2941	])
2941	2942	fi
…	…
2949	2950	if test "${enable_avformat}" != "no"
2950	2951	then
2951		PKG_CHECK_MODULES(AVFORMAT,[libavformat],
	2952	PKG_CHECK_MODULES(AVFORMAT,[libavformat libavutil],
2952	2953	[
2953	2954	VLC_SAVE_FLAGS
…	…
2955	2956	CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}"
2956	2957	AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h)
	2958	AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
2957	2959	VLC_ADD_PLUGIN([avformat])
2958	2960	VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS])
…	…
2960	2962	VLC_RESTORE_FLAGS
2961	2963	],[
2962		AC_MSG_ERROR([Could not find libavformat. Use --disable-avformat to ignore this error.])
	2964	AC_MSG_ERROR([Could not find libavformat or libavutil. Use --disable-avformat to ignore this error.])
2963	2965	])
2964	2966	fi