GNOME Bugzilla – Bug 661614
mplex configure check broken with mjpegtools 2.0.0
Last modified: 2011-11-01 11:41:43 UTC
Created attachment 198890 [details] [review] autoconf fix for mplex test Due to the addition of an unconditional inclusion of config.h in mjpegtool 2.0.0's stream_params.h header the autoconf test for the mplex module now fails. The attached patch copies the hack used for mpeg2enc which has the same issue and applies it to the mplex autoconf test. Also I noticed a typo with one of the variable names in the autoconf test for mpeg2enc which had CPP_FLAGS instead of CPPFLAGS as it should be. configure: *** checking feature: mpeg2enc *** configure: *** for plug-ins: mpeg2enc *** checking for MPEG2ENC... yes checking mpeg2encoder.hh usability... yes checking mpeg2encoder.hh presence... yes checking for mpeg2encoder.hh... yes checking for valid mpeg2enc objects... yes checking mpeg2syntaxcodes.h usability... yes checking mpeg2syntaxcodes.h presence... yes checking for mpeg2syntaxcodes.h... yes configure: *** These plugins will be built: mpeg2enc configure: *** checking feature: mplex *** configure: *** for plug-ins: mplex *** checking for MPLEX... yes checking interact.hpp usability... no checking interact.hpp presence... no checking for interact.hpp... no configure: *** These plugins will not be built: mplex configure:35735: checking interact.hpp usability configure:35735: c++ -c -O2 -pipe -I/usr/local/include -I/usr/local/include/libpng -I/usr/X11R6/include -I/usr/local/include/mjpegtools -I/usr/local/include/mjpegtools/mpeg2enc -I/usr/local/include/mjpegtools/mplex conftest.cpp >&5 In file included from /usr/local/include/mjpegtools/mplex/interact.hpp:30, from conftest.cpp:113: /usr/local/include/mjpegtools/mplex/stream_params.hpp:26:20: error: config.h: No such file or directory
Pushed, thanks for the patch! (Though "git format-patch"-style patches are genereally prefered) commit 8f1a67896b58bcd4b378bbaf71ad377a800989a6 Author: Brad Smith <brad@comstyle.com> Date: Tue Nov 1 11:11:47 2011 +0000 configure: hack around broken mplex 2.0.0 headers in mplex check Due to the addition of an unconditional inclusion of config.h in mjpegtool 2.0.0's stream_params.h header the autoconf test for the mplex module failed. Hack around this in the same way we did for mpeg2enc. https://bugzilla.gnome.org/show_bug.cgi?id=661614 commit 178ae4f99d910ed13d41dd2aa890c7ddbd3b8d7c Author: Brad Smith <brad@comstyle.com> Date: Tue Nov 1 11:09:52 2011 +0000 configure: fix typo in mpeg2enc check so CPPFLAGS get restored correctly https://bugzilla.gnome.org/show_bug.cgi?id=661614