Make autogen work again.

Original commit message from CVS:
* autogen.sh:
* configure.ac:
Make autogen work again.

diff --git a/ChangeLog b/ChangeLog
index 35f0698985dc33f7259fe3e418fb4b8aef3b69c0..2535c4762ed2a11ca68936ba166fdc9dcde7ddaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-30  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * autogen.sh:
+       * configure.ac:
+         Make autogen work again.
+
 2005-08-30  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * configure.ac:

diff --git a/autogen.sh b/autogen.sh
index d211d92e67ab65d2613a4e5e54e90c3637044948..ed1d3c1869c8f2e65c2bbd93153321092898ac12 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 
 DIE=0
 package=gst-plugins
-srcfile=gst/law/alaw.c
+srcfile=gst/librfb/gstrfbsrc.c
 
 # a quick cvs co if necessary to alleviate the pain - may remove this
 # when developers get a clue ;)

diff --git a/configure.ac b/configure.ac
index 88f234bd1dd1807239977e6968551969dd28e7b4..8192f5931c4e5fe2deaeff6c89c57ba98b605dac 100644 (file)
--- 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 \
                 "