configure.ac: Pull in librfb from my CVS tree, because it is too small and annoying...

Original commit message from CVS:
* configure.ac: Pull in librfb from my CVS tree, because it is
too small and annoying to be separate.  Move rfbsrc plugin
to gst/.
* ext/Makefile.am:
* ext/librfb/Makefile.am:
* ext/librfb/gstrfbsrc.c:
* gst/librfb/Makefile.am:
* gst/librfb/gstrfbsrc.c:
* gst/librfb/rfb.c:
* gst/librfb/rfb.h:
* gst/librfb/rfbbuffer.c:
* gst/librfb/rfbbuffer.h:
* gst/librfb/rfbbytestream.c:
* gst/librfb/rfbbytestream.h:
* gst/librfb/rfbcontext.h:
* gst/librfb/rfbdecoder.c:
* gst/librfb/rfbdecoder.h:
* gst/librfb/rfbutil.h:

diff --git a/ChangeLog b/ChangeLog
index c801394..54db7f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2005-02-11  David Schleef  <ds@schleef.org>
+
+       * configure.ac: Pull in librfb from my CVS tree, because it is
+         too small and annoying to be separate.  Move rfbsrc plugin
+         to gst/.
+       * ext/Makefile.am:
+       * ext/librfb/Makefile.am:
+       * ext/librfb/gstrfbsrc.c:
+       * gst/librfb/Makefile.am:
+       * gst/librfb/gstrfbsrc.c:
+       * gst/librfb/rfb.c:
+       * gst/librfb/rfb.h:
+       * gst/librfb/rfbbuffer.c:
+       * gst/librfb/rfbbuffer.h:
+       * gst/librfb/rfbbytestream.c:
+       * gst/librfb/rfbbytestream.h:
+       * gst/librfb/rfbcontext.h:
+       * gst/librfb/rfbdecoder.c:
+       * gst/librfb/rfbdecoder.h:
+       * gst/librfb/rfbutil.h:
+
 2005-02-10  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/speed/Makefile.am:

diff --git a/configure.ac b/configure.ac
index 870d269..5a7d18f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -387,6 +387,7 @@ GST_PLUGINS_ALL="\
        interleave \
        law \
        level \
+       librfb \
        matroska \
        median \
        mixmatrix \
@@ -1969,6 +1970,7 @@ gst/goom/Makefile
 gst/interleave/Makefile
 gst/law/Makefile
 gst/level/Makefile
+gst/librfb/Makefile
 gst/matroska/Makefile
 gst/median/Makefile
 gst/mixmatrix/Makefile
@@ -2074,7 +2076,6 @@ ext/libcaca/Makefile
 ext/libfame/Makefile
 ext/libmng/Makefile
 ext/libpng/Makefile
-ext/librfb/Makefile
 ext/libvisual/Makefile
 ext/mad/Makefile
 dnl ext/mas/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 689b339..19c8c3d 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -220,12 +220,6 @@ else
 POLYP_DIR=
 endif
 
-if USE_LIBRFB
-LIBRFB_DIR=librfb
-else
-LIBRFB_DIR=
-endif
-
 if USE_LIBVISUAL
 LIBVISUAL_DIR=libvisual
 else
@@ -439,7 +433,6 @@ SUBDIRS=\
        $(LIBFAME_DIR) \
        $(LIBMNG_DIR) \
        $(LIBPNG_DIR) \
-       $(LIBRFB_DIR) \
        $(LIBVISUAL_DIR) \
        $(MAD_DIR) \
        $(MIKMOD_DIR) \
@@ -505,7 +498,6 @@ DIST_SUBDIRS=\
        libmng \
        libmms \
        libpng \
-       librfb \
        libvisual \
        mad \
        mikmod \