Now allow latest vicious-extensions to be included in the release. It was

Tue Jan 28 15:35:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>

        * autogen.sh: Now allow latest vicious-extensions to be included
          in the release.  It was left out of the previous release due to
          schedule freeze.

2 files changed, 4 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index f782f655..0f4caf35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tue Jan 25 17:18:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>
+Tue Jan 28 15:35:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>
 
 	* This patch makes gdm2 build with newer versions of the build
 	  tools.  Previously it was requiring automake-1.4, autoconf-1.4,
@@ -19,6 +19,9 @@ Tue Jan 25 17:18:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>
 	  Made sure all *.desktop files are in EXTRA_DIST.
 	* daemon/slave.c: Not related to above patches.  Fixed grammar again
 	  since we aren't in a string freeze.  Sorry for the confusion.  
+	* autogen.sh: Now allow latest vicious-extensions to be included
+	  in the release.  It was left out of the previous release due to
+	  schedule freeze.
 
 Tue Jan 25 17:18:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>
 
diff --git a/autogen.sh b/autogen.sh
index 2ad62ff6..512c8ca3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,14 +12,6 @@ if test ! -d $srcdir/vicious-extensions; then
 	exit 1
 fi
 
-if grep VICIOUS_CFLAGS $srcdir/vicious-extensions/Makefile.am > /dev/null; then 
-	echo "**Error**: Use the gnome-2-6 branch of vicious-extensions "
-	echo "for now, you have to do: cvs -z3 update -rgnome-2-6"
-	echo "in the vicious-extensions subdirectory."
-	echo "This will be fixed up after 2.6 is released ..."
-	exit 1
-fi
-
 (test -f $srcdir/configure.in \
   && test -d $srcdir/daemon \
   && test -f $srcdir/daemon/gdm.h) || {