From: <jpg...@us...> - 2008-04-15 22:13:21
|
Revision: 1402 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1402&view=rev Author: jpgrayson Date: 2008-04-15 15:13:27 -0700 (Tue, 15 Apr 2008) Log Message: ----------- Make the AM_CONDITIONAL also be conditional on the "with_xxx". The primary benefit of this change is that --without-ffmpeg will work as expected even if libavcodec.pc and friends are installed on your system. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-04-07 16:07:39 UTC (rev 1401) +++ trunk/configure.ac 2008-04-15 22:13:27 UTC (rev 1402) @@ -350,10 +350,10 @@ fi AM_CONDITIONAL(VIDEO, test x$enable_video = xyes) -AM_CONDITIONAL(OGG, test x$has_ogg = xyes) -AM_CONDITIONAL(THEORA, test x$has_theora = xyes) -AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes) -AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes) +AM_CONDITIONAL(OGG, test x$has_ogg = xyes && test x$with_ogg != xno) +AM_CONDITIONAL(THEORA, test x$has_theora = xyes && test x$with_theora != xno) +AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes && test x$with_vidcap != xno) +AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes && test x$with_ffmpeg != xno) AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan) AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test x$with_gsm != xno) AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |