From 632a38efe77f9b911b1303e0230e0f06d4e1c897 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Tue, 30 Aug 2005 20:42:39 +0000
Subject: Make autogen work again.

Original commit message from CVS:
* autogen.sh:
* configure.ac:
Make autogen work again.
---
 configure.ac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 88f234bd..8192f593 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AS_LIBTOOL_TAGS([CXX])
 AM_PROG_LIBTOOL
 
 dnl FIXME take something else ?
-AC_CONFIG_SRCDIR([gst/law/alaw.c])
+AC_CONFIG_SRCDIR([gst/librfb/gstrfbsrc.c])
 AM_CONFIG_HEADER(config.h)
 
 dnl Add parameters for aclocal
@@ -289,13 +289,10 @@ GST_PLUGINS_ALL="\
 		qtdemux \
 		realmedia \
 		silence \
-<<<<<<< configure.ac
-=======
 		udp     \
 		videobox \
 		wavenc \
 		wavparse \
->>>>>>> 1.580
 		mpegaudioparse \
                 "
 
-- 
cgit v1.2.1