changeset 4498:e8b8b22ce567

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

--- a/README	Mon Apr 21 02:54:36 2008 -0500
+++ b/README	Mon Apr 21 16:10:32 2008 +0300
@@ -78,6 +78,8 @@
   libmowgli >= 0.4
     http://www.atheme.org/projects/mowgli.shtml
 
+  GNU Make >= 3.80
+
 If you compile Audacious from a fresh Mercurial checkout, you will also
 need the following tools:
 

--- a/configure.ac	Mon Apr 21 02:54:36 2008 -0500
+++ b/configure.ac	Mon Apr 21 16:10:32 2008 +0300
@@ -92,25 +92,12 @@
 dnl =============
 AC_PATH_PROG([AUDACIOUS_PATH], [audacious], [no])
 
-AC_ARG_WITH([rc-path], [dnl
-  --with-rc-path=path          Resource and configuration path for Audacious
-                               relative to $HOME. (deprecated, use XDG)],
-    [rc_path=$withval],
-    [rc_path=.audacious]
-)
-AC_DEFINE_UNQUOTED([AUD_RCPATH], "$rc_path",
-    [Resource and configuration path for audacious relative to $HOME.]
-)
-AC_DEFINE([DOTAUDACIOUS_COMPAT], 1, [Enable compatibility for $HOME/.audacious])
-AC_SUBST([AUD_RCPATH])
-
-
 AUD_ARG_ENABLE([one-plugin-dir], [no],
-[  --enable-one-plugin-dir      Use a single plugin dir (default=no)])
+[  --enable-one-plugin-dir      Use a single plugin dir (def: no)])
 
 
 AUD_ARG_ENABLE([user-plugin-dir], [yes],
-[  --disable-user-plugin-dir    Disable per-user plugin dir])
+[  --disable-user-plugin-dir    Disable per-user plugin dir (def: enabled)])
 
 if test "x$enable_user_plugin_dir" = "xno"; then
     AC_DEFINE([DISABLE_USER_PLUGIN_DIR], 1, [Define to disable per user plugin directory])
@@ -189,7 +176,7 @@
 dnl Chardet support
 dnl ===============
 AUD_ARG_ENABLE([chardet], [yes],
-[  --enable-chardet             Enable charset detection support],
+[  --disable-chardet             Disable charset detection support (def: enabled)],
 [
     AC_DEFINE([USE_CHARDET], 1, [Define if character set detection enabled])
     AC_CHECK_LIB([udet_c], [detectCharset], [
@@ -205,7 +192,7 @@
 dnl D-Bus support
 dnl =============
 AUD_ARG_ENABLE([dbus], [yes],
-[  --enable-dbus                Enable D-Bus support],
+[  --enable-dbus                Enable D-Bus support (def: enabled)],
 [
     PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gthread-2.0],
         [enable_dbus=yes],
@@ -234,7 +221,7 @@
 dnl libsamplerate support
 dnl =====================
 AUD_ARG_ENABLE([samplerate], [no],
-[  --enable-samplerate          Enable libsamplerate support],
+[  --enable-samplerate          Enable libsamplerate support (def: disabled)],
 [
     AUD_CHECK_MODULE([SAMPLERATE], [samplerate],, [libsamplerate])
     aud_save_LIBS="$LIBS"
@@ -255,7 +242,7 @@
 dnl xspf playlist support
 dnl =====================
 AUD_ARG_ENABLE([xspf], [yes],
-[  --disable-xspf               Disable XSPF support],
+[  --disable-xspf               Disable XSPF support (def: enabled)],
 [
     AM_PATH_XML2([2.0.0],, [
        AC_MSG_WARN([*** libxml2 is not installed. XSPF playlist support will not be built. ***])
@@ -273,7 +260,7 @@
 REGEX_LIBS=
 REGEX_CFLAGS=
 AC_ARG_WITH([regexlib],
-[[  --with-regexlib[=gnu/oniguruma/pcre]   use the chosen regex library (default: gnu)]],
+[[  --with-regexlib[=gnu/oniguruma/pcre]   use the chosen regex library (def: gnu)]],
 [
 case $withval in
   pcre)
@@ -306,7 +293,7 @@
 dnl SSE2 support
 dnl ============
 AUD_ARG_ENABLE([sse2], [yes],
-[  --disable-sse2               Disable SSE2 support],
+[  --disable-sse2               Disable SSE2 support (def: enabled)],
 [
     AC_MSG_CHECKING([SSE2 support])
     aud_my_save_CFLAGS="$CFLAGS"
@@ -335,7 +322,7 @@
 dnl AltiVec support 
 dnl ===============
 AUD_ARG_ENABLE([altivec], [yes],
-[  --disable-altivec            Disable AltiVec support],
+[  --disable-altivec            Disable AltiVec support (def: enabled)],
 [
     AC_CHECK_HEADERS([altivec.h],
     [
@@ -357,7 +344,7 @@
 AC_DEFINE_UNQUOTED([AUDACIOUS_DESKTOP_FILE], "${desktop_file}", [Location of the desktop file])
 
 AUD_ARG_ENABLE([sm], [yes],
-[  --disable-sm                 Disable session management],
+[  --disable-sm                 Disable session management (def: enabled)],
 [
     PKG_CHECK_MODULES([SM], [sm >= 1.0], [
         AC_DEFINE([USE_EGGSM], 1, [Define if session management should be used.])
@@ -492,8 +479,6 @@
 echo "  Current Audacious executable:           $AUDACIOUS_PATH"
 fi
 
-echo "  Legacy configuration path:              \$HOME/$rc_path"
-echo ""
 echo "  Use one plugin dir:                     $enable_one_plugin_dir"
 echo "  Allow user plugin dir:                  $enable_user_plugin_dir"
 echo ""

--- a/extra.mk.in	Mon Apr 21 02:54:36 2008 -0500
+++ b/extra.mk.in	Mon Apr 21 16:10:32 2008 +0300
@@ -169,7 +169,6 @@
 RM ?= @RM@
 INSTALL_PROGRAM ?= @INSTALL_PROGRAM@
 PLUGIN_LDFLAGS ?= @PLUGIN_LDFLAGS@
-AUD_RCPATH ?= @AUD_RCPATH@
 VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@
 IMPLIB_LIBS ?= @IMPLIB_LIBS@
 MSGMERGE ?= @MSGMERGE@