diff options
| author | Zeeshan Ali <zeenix@gmail.com> | 2005-05-07 18:50:39 +0000 |
|---|---|---|
| committer | Zeeshan Ali <zeenix@gmail.com> | 2005-05-07 18:50:39 +0000 |
| commit | 98ebed475064924260dc3c55182a730c91d35b7b (patch) | |
| tree | 7479d381ff119798892529e7f55b2f158b5d2b07 /configure.ac | |
| parent | 86925a16680a14f665e3f072fa56529cd33e9b7f (diff) | |
Fixed the build by fixing a small mistake of Wim.
Original commit message from CVS:
Fixed the build by fixing a small mistake of Wim.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index e018feb7..5cb7b3db 100644 --- a/configure.ac +++ b/configure.ac @@ -361,7 +361,10 @@ dnl ]) dnl ]) dnl ]) -<<<<<<< configure.ac +dnl ########################### +dnl # Configure external libs # +dnl ########################### + dnl *** aalib *** translit(dnm, m, l) AM_CONDITIONAL(USE_AALIB, true) GST_CHECK_FEATURE(AALIB, [aasink plug-in], aasink, [ @@ -369,14 +372,6 @@ GST_CHECK_FEATURE(AALIB, [aasink plug-in], aasink, [ AS_SCRUB_INCLUDE(AALIB_CFLAGS) ]) - -======= -dnl ########################### -dnl # Configure external libs # -dnl ########################### - - ->>>>>>> 1.538 dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) *** translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true) GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [ |