diff options
author | Peter Kjellerstedt <pkj@axis.com> | 2009-08-31 18:55:52 +0200 |
---|---|---|
committer | Peter Kjellerstedt <pkj@axis.com> | 2009-08-31 18:56:53 +0200 |
commit | 6a7b02e48065d07b1ea958c9129d5132374f8a3e (patch) | |
tree | 1150ed01c8e6b477416f28d11eb581cfd3f68a11 | |
parent | dfc4da71c3dfdd087ee8002fb22d016449784fc5 (diff) |
configure: A little clean up.
Reorder the list of AM_CONDITIONAL()s used when --disable-external is
specified to match the actual order of the plug-ins earlier in the file.
-rw-r--r-- | configure.ac | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 71fa21e7c..06e5758a1 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -492,7 +492,7 @@ AG_GST_CHECK_FEATURE(ASSRENDER, [ASS/SSA renderer], assrender, [ | |||
492 | AC_SUBST(ASSRENDER_CFLAGS) | 492 | AC_SUBST(ASSRENDER_CFLAGS) |
493 | AC_SUBST(ASSRENDER_LIBS) | 493 | AC_SUBST(ASSRENDER_LIBS) |
494 | 494 | ||
495 | dnl *** amrwb-enc *** | 495 | dnl *** amrwb *** |
496 | translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true) | 496 | translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true) |
497 | AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbenc, [ | 497 | AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbenc, [ |
498 | AG_GST_CHECK_LIBHEADER(AMRWB, amrwb, | 498 | AG_GST_CHECK_LIBHEADER(AMRWB, amrwb, |
@@ -1056,7 +1056,7 @@ AG_GST_CHECK_FEATURE(MODPLUG, modplug, modplug, [ | |||
1056 | AC_SUBST(MODPLUG_LIBS) | 1056 | AC_SUBST(MODPLUG_LIBS) |
1057 | ]) | 1057 | ]) |
1058 | 1058 | ||
1059 | dnl check for libmimic | 1059 | dnl *** mimic *** |
1060 | translit(dnm, m, l) AM_CONDITIONAL(USE_MIMIC, true) | 1060 | translit(dnm, m, l) AM_CONDITIONAL(USE_MIMIC, true) |
1061 | AG_GST_CHECK_FEATURE(MIMIC, [libmimic library], mimic, [ | 1061 | AG_GST_CHECK_FEATURE(MIMIC, [libmimic library], mimic, [ |
1062 | MIMDEC_REQUIRED=1.0 | 1062 | MIMDEC_REQUIRED=1.0 |
@@ -1579,8 +1579,6 @@ else | |||
1579 | dnl not building plugins with external dependencies, | 1579 | dnl not building plugins with external dependencies, |
1580 | dnl but we still need to set the conditionals | 1580 | dnl but we still need to set the conditionals |
1581 | 1581 | ||
1582 | AM_CONDITIONAL(USE_QUICKTIME, false) | ||
1583 | AM_CONDITIONAL(USE_VCD, false) | ||
1584 | AM_CONDITIONAL(USE_ALSA, false) | 1582 | AM_CONDITIONAL(USE_ALSA, false) |
1585 | AM_CONDITIONAL(USE_ASSRENDER, false) | 1583 | AM_CONDITIONAL(USE_ASSRENDER, false) |
1586 | AM_CONDITIONAL(USE_AMRWB, false) | 1584 | AM_CONDITIONAL(USE_AMRWB, false) |
@@ -1590,13 +1588,11 @@ AM_CONDITIONAL(USE_CDAUDIO, false) | |||
1590 | AM_CONDITIONAL(USE_CELT, false) | 1588 | AM_CONDITIONAL(USE_CELT, false) |
1591 | AM_CONDITIONAL(USE_DC1394, false) | 1589 | AM_CONDITIONAL(USE_DC1394, false) |
1592 | AM_CONDITIONAL(USE_DIRECTFB, false) | 1590 | AM_CONDITIONAL(USE_DIRECTFB, false) |
1593 | AM_CONDITIONAL(USE_DIRECTDRAW, false) | ||
1594 | AM_CONDITIONAL(USE_DIRECTSOUND, false) | ||
1595 | AM_CONDITIONAL(USE_DTS, false) | ||
1596 | AM_CONDITIONAL(USE_DIRAC, false) | 1591 | AM_CONDITIONAL(USE_DIRAC, false) |
1592 | AM_CONDITIONAL(USE_DTS, false) | ||
1597 | AM_CONDITIONAL(USE_DIVX, false) | 1593 | AM_CONDITIONAL(USE_DIVX, false) |
1598 | AM_CONDITIONAL(USE_DVB, false) | ||
1599 | AM_CONDITIONAL(USE_DVDNAV, false) | 1594 | AM_CONDITIONAL(USE_DVDNAV, false) |
1595 | AM_CONDITIONAL(USE_METADATA, false) | ||
1600 | AM_CONDITIONAL(USE_FAAC, false) | 1596 | AM_CONDITIONAL(USE_FAAC, false) |
1601 | AM_CONDITIONAL(USE_FAAD, false) | 1597 | AM_CONDITIONAL(USE_FAAD, false) |
1602 | AM_CONDITIONAL(USE_FBDEV, false) | 1598 | AM_CONDITIONAL(USE_FBDEV, false) |
@@ -1604,13 +1600,14 @@ AM_CONDITIONAL(USE_GSM, false) | |||
1604 | AM_CONDITIONAL(USE_IVORBIS, false) | 1600 | AM_CONDITIONAL(USE_IVORBIS, false) |
1605 | AM_CONDITIONAL(USE_JACK, false) | 1601 | AM_CONDITIONAL(USE_JACK, false) |
1606 | AM_CONDITIONAL(USE_JP2K, false) | 1602 | AM_CONDITIONAL(USE_JP2K, false) |
1603 | AM_CONDITIONAL(USE_KATE, false) | ||
1604 | AM_CONDITIONAL(USE_TIGER, false) | ||
1607 | AM_CONDITIONAL(USE_LADSPA, false) | 1605 | AM_CONDITIONAL(USE_LADSPA, false) |
1608 | AM_CONDITIONAL(USE_LV2, false) | 1606 | AM_CONDITIONAL(USE_LV2, false) |
1609 | AM_CONDITIONAL(USE_LIBMMS, false) | 1607 | AM_CONDITIONAL(USE_LIBMMS, false) |
1610 | AM_CONDITIONAL(USE_MODPLUG, false) | 1608 | AM_CONDITIONAL(USE_MODPLUG, false) |
1611 | AM_CONDITIONAL(USE_METADATA, false) | ||
1612 | AM_CONDITIONAL(USE_MPEG2ENC, false) | ||
1613 | AM_CONDITIONAL(USE_MIMIC, false) | 1609 | AM_CONDITIONAL(USE_MIMIC, false) |
1610 | AM_CONDITIONAL(USE_MPEG2ENC, false) | ||
1614 | AM_CONDITIONAL(USE_MPLEX, false) | 1611 | AM_CONDITIONAL(USE_MPLEX, false) |
1615 | AM_CONDITIONAL(USE_MUSEPACK, false) | 1612 | AM_CONDITIONAL(USE_MUSEPACK, false) |
1616 | AM_CONDITIONAL(USE_MUSICBRAINZ, false) | 1613 | AM_CONDITIONAL(USE_MUSICBRAINZ, false) |
@@ -1618,20 +1615,19 @@ AM_CONDITIONAL(USE_MYTHTV, false) | |||
1618 | AM_CONDITIONAL(USE_NAS, false) | 1615 | AM_CONDITIONAL(USE_NAS, false) |
1619 | AM_CONDITIONAL(USE_NEON, false) | 1616 | AM_CONDITIONAL(USE_NEON, false) |
1620 | AM_CONDITIONAL(USE_OFA, false) | 1617 | AM_CONDITIONAL(USE_OFA, false) |
1621 | AM_CONDITIONAL(USE_OSS4, false) | ||
1622 | AM_CONDITIONAL(USE_RSVG, false) | 1618 | AM_CONDITIONAL(USE_RSVG, false) |
1619 | AM_CONDITIONAL(USE_TIMIDITY, false) | ||
1620 | AM_CONDITIONAL(USE_WILDMIDI, false) | ||
1623 | AM_CONDITIONAL(USE_SDL, false) | 1621 | AM_CONDITIONAL(USE_SDL, false) |
1624 | AM_CONDITIONAL(USE_SNDFILE, false) | 1622 | AM_CONDITIONAL(USE_SNDFILE, false) |
1625 | AM_CONDITIONAL(USE_SOUNDTOUCH, false) | 1623 | AM_CONDITIONAL(USE_SOUNDTOUCH, false) |
1626 | AM_CONDITIONAL(USE_GME, false) | ||
1627 | AM_CONDITIONAL(USE_SPC, false) | 1624 | AM_CONDITIONAL(USE_SPC, false) |
1625 | AM_CONDITIONAL(USE_GME, false) | ||
1628 | AM_CONDITIONAL(USE_SWFDEC, false) | 1626 | AM_CONDITIONAL(USE_SWFDEC, false) |
1629 | AM_CONDITIONAL(USE_THEORADEC, false) | 1627 | AM_CONDITIONAL(USE_THEORADEC, false) |
1630 | AM_CONDITIONAL(USE_TIMIDITY, false) | ||
1631 | AM_CONDITIONAL(USE_XVID, false) | 1628 | AM_CONDITIONAL(USE_XVID, false) |
1632 | AM_CONDITIONAL(USE_WILDMIDI, false) | 1629 | AM_CONDITIONAL(USE_DVB, false) |
1633 | AM_CONDITIONAL(USE_KATE, false) | 1630 | AM_CONDITIONAL(USE_OSS4, false) |
1634 | AM_CONDITIONAL(USE_TIGER, false) | ||
1635 | AM_CONDITIONAL(USE_WININET, false) | 1631 | AM_CONDITIONAL(USE_WININET, false) |
1636 | AM_CONDITIONAL(USE_ACM, false) | 1632 | AM_CONDITIONAL(USE_ACM, false) |
1637 | AM_CONDITIONAL(USE_VDPAU, false) | 1633 | AM_CONDITIONAL(USE_VDPAU, false) |