Re: [Crystal-cvs] SF.net SVN: crystal:[39380] CS/branches/soc2013/videorecording
Eric Sunshine <[email protected]> Thu, 13 Jun 2013 13:50:35 -0400
| Newsgroups | gmane.comp.graphics.crystalspace.devel |
|---|---|
| Message-ID | <CAPig+cSOa1wzQSHC2AZEw7Jw66tbEUASd1m03P0mt+einHf3Wg@mail.gmail.com> |
On Thu, Jun 13, 2013 at 12:33 PM, <[email protected]> wrote: > Revision: 39380 > Author: stepik777 > Date: 2013-06-13 16:33:05 +0000 (Thu, 13 Jun 2013) Nobody mentioned it, so you would not have known, but something to keep in mind for the future: When it comes time to merge the branch back into trunk, changes to configure.ac usually merge cleanly, but changes to configure typically result in conflicts. Consequently, it's a good idea to commit configure.ac separately from the generated configure so that the configure commit can be ignored at merge time. More notes below. > +CS_NOTABLE([avcodec], [], [], [$cs_cv_libavcodec], > + [CS_CHECK_LIB_WITH([avcodec], > + [AC_LANG_PROGRAM( > + [[#include <libavcodec/avcodec.h>]], > + [avcodec_register_all();])], > + [], [], > + [CS_EMIT_BUILD_RESULT([cs_cv_libavcodec], [AVCODEC])])]) > > +CS_NOTABLE([avformat], [], [], [$cs_cv_libavformat], > + [AS_IF([test "$cs_cv_libavcodec" = yes], > + [CS_CHECK_LIB_WITH([avformat], > + [AC_LANG_PROGRAM( > + [[#include <libavformat/avformat.h>]], > + [av_register_all();])], > + [], [], > + [CS_EMIT_BUILD_RESULT([cs_cv_libavformat], [AVFORMAT])], [], > + [$cs_cv_libavcodec_cflags], > + [$cs_cv_libavcodec_lflags], > + [$cs_cv_libavcodec_libs])])]) > + > +CS_NOTABLE([avutil], [], [], [$cs_cv_libavutil], > + [AS_IF([test "$cs_cv_libavformat" = yes], > + [CS_CHECK_LIB_WITH([avutil], > + [AC_LANG_PROGRAM( > + [[#include <libavformat/avformat.h> > + #include <libavutil/avutil.h>]], > + [av_register_all();])], The actual test condition here appears to be identical to that in the libavformat test. Is that intended? Usually, you want the test to invoke a function which is unique to the library being checked. > + [], [], > + [CS_EMIT_BUILD_RESULT([cs_cv_libavutil], [FFMPEG])], [], Copy/paste error? (FFMPEG) > + [$cs_cv_libavcodec_cflags $cs_cv_libavformat_cflags], > + [$cs_cv_libavcodec_lflags $cs_cv_libavformat_lflags], > + [$cs_cv_libavcodec_libs $cs_cv_libavformat_libs])])]) ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev