summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorZeeshan Ali <zeenix@gmail.com>2005-05-07 18:50:39 +0000
committerZeeshan Ali <zeenix@gmail.com>2005-05-07 18:50:39 +0000
commit43e5cd1ceb38c2dfe3c30568598f8d44f1c4da95 (patch)
treecc09ec582b5725c3c8af3436dc385bb2489839ca /configure.ac
parent36df3a26e26335468ea4d758aabb2cc241c65390 (diff)
downloadgst-plugins-bad-43e5cd1ceb38c2dfe3c30568598f8d44f1c4da95.tar.gz
gst-plugins-bad-43e5cd1ceb38c2dfe3c30568598f8d44f1c4da95.tar.bz2
gst-plugins-bad-43e5cd1ceb38c2dfe3c30568598f8d44f1c4da95.zip
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.ac13
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, [