diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -580,7 +580,7 @@ _speex=auto _theora=auto _mp3lib=yes _liba52=auto -_liba52_internal=auto +_liba52_internal=yes _libdca=auto _libmpeg2=auto _faad=auto @@ -6084,9 +6084,8 @@ echores "$_mp3lib" echocheck "liba52 support" _def_liba52='#undef CONFIG_LIBA52' _def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL" -if test "$_liba52_internal" = auto ; then +if test "$_liba52_internal" = yes ; then _liba52=yes - _liba52_internal=yes _def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1" _res_comment="internal" elif test "$_liba52_internal" = no && test "$_liba52" = auto ; then @@ -6096,9 +6095,7 @@ elif test "$_liba52_internal" = no && test "$_liba52" = auto ; then #include <a52dec/a52.h> int main(void) { a52_state_t *testHand; testHand=a52_init(0); return 0; } EOF - cc_check -la52 && _liba52=yes - _ld_extra="$_ld_extra -la52" - _res_comment="external" + cc_check -la52 && _liba52=yes && _res_comment="external" && _ld_extra="$_ld_extra -la52" fi if test "$_liba52" = yes ; then _def_liba52='#define CONFIG_LIBA52 1' @@ -8061,8 +8058,8 @@ HAVE_XVMC = $_xvmc DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&," -MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," -MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," +MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," +MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," EOF |