From ddfa2f3cef3e9bcf25a8f5d584d3978d7c63d58b Mon Sep 17 00:00:00 2001 From: kpfleming Date: Tue, 21 Jul 2009 13:48:38 +0000 Subject: Merged revisions 207680 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r207680 | kpfleming | 2009-07-21 08:28:04 -0500 (Tue, 21 Jul 2009) | 18 lines Merged revisions 207647 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207647 | kpfleming | 2009-07-21 08:04:44 -0500 (Tue, 21 Jul 2009) | 12 lines Ensure that user-provided CFLAGS and LDFLAGS are honored. This commit changes the build system so that user-provided flags (in ASTCFLAGS and ASTLDFLAGS) are supplied to the compiler/linker *after* all flags provided by the build system itself, so that the user can effectively override the build system's flags if desired. In addition, ASTCFLAGS and ASTLDFLAGS can now be provided *either* in the environment before running 'make', or as variable assignments on the 'make' command line. As a result, the use of COPTS and LDOPTS is no longer necessary, so they are no longer documented, but are still supported so as not to break existing build systems that supply them when building Asterisk. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@207684 f38db490-d61c-443f-a65b-d21fe96a405b --- doc/video_console.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/video_console.txt') diff --git a/doc/video_console.txt b/doc/video_console.txt index 14ea0024a..103af10a0 100644 --- a/doc/video_console.txt +++ b/doc/video_console.txt @@ -8,7 +8,7 @@ working you need to perform the following steps: The simplest way to do it is add this one line to channels/Makefile: - chan_oss.so: ASTCFLAGS += -DHAVE_VIDEO_CONSOLE + chan_oss.so: _ASTCFLAGS+=-DHAVE_VIDEO_CONSOLE +++ Install prerequisite packages +++ -- cgit v1.2.3