add/remove stuff as in HEAD

Original commit message from CVS:
add/remove stuff as in HEAD

3 files changed, 54 insertions, 56 deletions

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..1fedf924c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,18 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
diff --git a/LICENSE_readme b/LICENSE_readme
new file mode 100644
index 000000000..2fe5f6a48
--- /dev/null
+++ b/LICENSE_readme
@@ -0,0 +1,36 @@
+GStreamer is developed under the terms of the LGPL (see LICENSE file for details). Some of our plugins however rely on libraries which are available under i other licenses. This means that if you are using an applications which has a non-GPL compatible license, for instance a closed-source application with GStreamer you have to make sure not to use GPL linked plugins.
+When using GPL linked plugins GStreamer is for all practical reasons under the GPL itself. 
+
+The plugins which use a GPL library are as follows:
+cdparanoia      libcdparanoia   (http://www.xiph.org/paranoia/)
+aasink		aalib		(http://aa-project.sourceforge.net/aalib/)
+xmms		libxmms		(http://www.xmms.org)
+decdvd		ac3dec,mpeg2dec	(http://linuxvideo.org/mpeg2dec/,http://linuxvideo.org/ac3dec/)a
+
+Plugins which use library a LGPL are as follows:
+Colorspace 	Hermes 		(http://www.clanlib.org/hermes/)
+httpsrc		libghttp	(ftp.gnome.org/pub/GNOME/stable/sources/libghttp/)
+alsasink	alsa		(http://alsa-project.org)
+aRts		aRts		(http://arts-project.org)
+sdlsink		libsdl		(http://www.libsdl.org)
+gnomevfssource  gnome-vfs       (ftp.gnome.org//pub/GNOME/stable/sources/gnome-vfs)
+gnomevfssink    gnome-vfs
+esdsink         libesd          (ftp.gnome.org/pub/GNOME/stable/sources/esound)
+icastsend       libshout        (http://www.icecast.org)
+lame            libmp3lame      (http://www.mp3dev.org/mp3/)
+gst1394         libraw1394      (http://linux1394.sourceforge.net)
+flac		libFLAC		(http://flac.sourceforge.net)
+RTP		ortp		(http://www.linphone.org/ortp/)
+
+Plugins which use a BSD covered library are as follows:
+vorbisenc	libogg/libvorbis	(http://www.xiph.org/ogg/vorbis)
+vorbisdec	libogg/libvorbis
+
+Plugins based on libraries with other free licenses:
+xsink		libXv		(MIT X11 / X Consortium license)
+gsm		libgsm		(MIT license http://kbs.cs.tu-berlin.de/~jutta/toast.html)
+
+Plugins using non-free libraries:
+xamp3 decoder 	libxaudio       (http://www.xaudio.com/)
+wincodec	win32ddl	(http://divx.euro.ru/)
+
diff --git a/m4/pkg.m4 b/m4/pkg.m4
deleted file mode 100644
index 874a120cf..000000000
--- a/m4/pkg.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7.0; then
-        echo "*** Your version of pkg-config is too old. You need version 0.7.0 or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     else
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
-
-