summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2005-07-14 19:06:24 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2005-07-14 19:06:24 +0000
commit69af162080fe4ae778b715ec21166a0a7372e035 (patch)
tree16c4128ac3a48eee4b0f30330122b9418d06d517
parentb77ac4a6aeeb700ae8ac5950b1750fb422fb60b0 (diff)
downloadgstreamer-plugins-bad-69af162080fe4ae778b715ec21166a0a7372e035.tar.gz
configure.ac: whoops committed something i shouldnt have from my tree :)
Original commit message from CVS: 2005-07-14 Zaheer Abbas Merali <zaheerabbas at merali dot org> * configure.ac: whoops committed something i shouldnt have from my tree :)
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac11
2 files changed, 5 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index c4932e5c6..67246c4a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2005-07-14 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* configure.ac:
+ whoops committed something i shouldnt have from my tree :)
+
+2005-07-14 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
+ * configure.ac:
* sys/ximage/Makefile.am:
* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_new),
(gst_ximagesink_ximage_destroy), (gst_ximagesink_xcontext_get),
diff --git a/configure.ac b/configure.ac
index f81f48b5b..150b03e10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1343,16 +1343,6 @@ GST_CHECK_FEATURE(LIBMMS, [mms protocol library], libmms, [
])
AC_SUBST(LIBMMS_LIBS)
-dnl *** live.com ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_LIVECOM, true)
-GST_CHECK_FEATURE(LIVECOM, [live.com rtsp library], livecom, [
- dnl fixme
- LIVECOM_CFLAGS="-I/usr/lib/live/liveMedia/include -I/usr/lib/live/UsageEnvironment/include -I/usr/lib/live/BasicUsageEnvironment/include -I/usr/lib/live/groupsock/include"
- LIVECOM_LIBS="-L/usr/lib/live -lgroupsock -lliveMedia -lUsageEnvironment -lBasicUsageEnvironment"
-])
-AC_SUBST(LIVECOM_CFLAGS)
-AC_SUBST(LIVECOM_LIBS)
-
dnl *** libmng ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBMNG, true)
GST_CHECK_FEATURE(LIBMNG, [libmng library], mngdec, [
@@ -2143,7 +2133,6 @@ ext/libfame/Makefile
ext/libmng/Makefile
ext/libpng/Makefile
ext/libvisual/Makefile
-ext/livecom/Makefile
ext/mad/Makefile
dnl ext/mas/Makefile
ext/mikmod/Makefile