changeset 4336:075fb84f6224

Automated merge with ssh://hg.atheme.org//hg/audacious

--- a/README	Thu Mar 13 16:23:10 2008 -0500
+++ b/README	Thu Mar 13 16:23:29 2008 -0500
@@ -1,7 +1,7 @@
 Audacious
 A relatively powerful media player
 
-Copyright (c) 2005-2007 Audacious Development Team (see AUTHORS)
+Copyright (c) 2005-2008 Audacious Development Team (see AUTHORS)
 
 Based on:
   BMP - Beep Media Player (c)2002-2005
@@ -63,6 +63,9 @@
 XMMS (http://xmms.org) and BMP (http://beep-media-player.org) which borrowed the
 Winamp GUI.
 
+However, Audacious is neither XMMS, or BMP, but takes a direction of its
+own.
+
 
 2. Installation
 ---------------
@@ -70,19 +73,21 @@
 Audacious requires the following libraries and their development
 packages installed:
 
-  Glib 2.6
-  (http://www.gtk.org/download/)
+  Glib 2.14.0
+    http://www.gtk.org/download/
 
-  GTK+ 2.6
-  (http://www.gtk.org/download/)
+  GTK+ 2.10.0
+    http://www.gtk.org/download/
 
   mcs >= 0.1
-  (http://sacredspiral.co.uk/~nenolod/mcs)
+    http://www.atheme.org/projects/mcs.shtml
 
-If you compile Audacious from a fresh CVS checkout, you will also need
-the following tools:
+  libmowgli >= 0.4
+    http://www.atheme.org/projects/mowgli.shtml
 
-  automake >= 1.9
+If you compile Audacious from a fresh Mercurial checkout, you will also
+need the following tools:
+
   autoconf >= 2.59
 
 Note that these tools and libraries are bundled with major Linux

--- a/configure.ac	Thu Mar 13 16:23:10 2008 -0500
+++ b/configure.ac	Thu Mar 13 16:23:29 2008 -0500
@@ -89,21 +89,21 @@
 
 PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.14.0 gtk+-2.0 >= 2.10.0 gthread-2.0 pango],
     [ADD_PC_REQUIRES([glib-2.0 >= 2.14.0, gtk+-2.0 >= 2.10.0])],
-    [AC_MSG_ERROR([Cannot find glib2/gtk2/pango])]
+    [AC_MSG_ERROR([Cannot find GLib2/Gtk+2/Pango])]
 )
 
 dnl Check for GLib.
 
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14.0],
     [ADD_PC_REQUIRES([glib-2.0 >= 2.14.0])],
-    [AC_MSG_ERROR([Cannot find glib2])]
+    [AC_MSG_ERROR([Cannot find GLib2])]
 )
 
 dnl Check for libmowgli.
 
 PKG_CHECK_MODULES(MOWGLI, [libmowgli >= 0.4],
     [ADD_PC_REQUIRES([libmowgli >= 0.4])],
-    [AC_MSG_ERROR([Cannot find libmowgli: try http://www.atheme-project.org/projects/mowgli.shtml])]
+    [AC_MSG_ERROR([Cannot find libmowgli: try http://www.atheme.org/projects/mowgli.shtml])]
 )
 
 # Check if socklen_t is defined
@@ -279,7 +279,7 @@
       AC_DEFINE(HAVE_MCS, , [Define if building with libmcs support])
       ADD_PC_REQUIRES([libmcs >= 0.1])
    ],
-   [AC_MSG_ERROR([Cannot find libmcs])]
+   [AC_MSG_ERROR([Cannot find libmcs, try http://www.atheme.org/projects/mcs.shtml])]
 )
 
 dnl AltiVec support 
@@ -525,14 +525,6 @@
 echo "  AltiVec:                                $enable_altivec"
 echo
 
-if test "$beep_cv_lib_xlibs_threadsafe" = "no"; then
-    echo "Note: You need to have thread-safe xlibs to use Audacious."
-    echo "If you are using libc5 thread aware Xlibs just skip this."
-    echo ""
-    echo "If you don't have those libs and you are on a libc5 system get them at:"
-    echo "ftp://ftp.dent.med.uni-muenchen.de/pub/wmglo/"
-fi
-
 if test "$BEEP_PATH" != "no" && test "$prefix/bin/audacious" != "$BEEP_PATH" ; then
     echo ""
     echo "Note: Configure has discovered that you already have Audacious installed"