# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1192851565 -10800
# Node ID 4809787d9d5ccdbc7c6bd1a2d19becca615917d4
# Parent  06d2b14562c4fd0e320623f5355d0ecf48d8605a# Parent  f8dc3d94186d431fa68da562349404ac1b037e8c
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 06d2b14562c4 -r 4809787d9d5c .hgtags
--- a/.hgtags	Sat Oct 20 06:39:14 2007 +0300
+++ b/.hgtags	Sat Oct 20 06:39:25 2007 +0300
@@ -3,3 +3,4 @@
 5f892afeb8e1ff5e60f32449359a59eda383f14a audacious-plugins-1.4.0-dr2
 49704b7f41db4070965a16fd6856a7e4760dbc1c audacious-plugins-1.4.0-dr3
 14adeaf9c20f3e940cf0117ba6aa4738cf7ce869 audacious-plugins-1.4.0-beta2
+42a16b5e51517c5722ea4881540b8766a2c91dd8 audacious-plugins-1.4.0-beta3
diff -r 06d2b14562c4 -r 4809787d9d5c buildsys.mk.in
--- a/buildsys.mk.in	Sat Oct 20 06:39:14 2007 +0300
+++ b/buildsys.mk.in	Sat Oct 20 06:39:25 2007 +0300
@@ -104,7 +104,7 @@
 			esac; \
 		done; \
 		if test x"$$list" != "x"; then \
-			if ${CPP} ${CPPFLAGS} -M $$list >.deps; then \
+			if ${CC} ${CPPFLAGS} -M $$list >.deps; then \
 				${DEPEND_OK}; \
 			else \
 				${DEPEND_FAILED}; \
diff -r 06d2b14562c4 -r 4809787d9d5c configure.ac
--- a/configure.ac	Sat Oct 20 06:39:14 2007 +0300
+++ b/configure.ac	Sat Oct 20 06:39:25 2007 +0300
@@ -368,8 +368,13 @@
 
 if test "$enable_mp3" = "yes"; then
         AC_CHECK_LIB(mad, mad_timer_add,
-		[INPUT_PLUGINS="$INPUT_PLUGINS madplug"],
-		[enable_mp3="no"])
+		[INPUT_PLUGINS="$INPUT_PLUGINS madplug"
+		 MAD_CFLAGS=""
+		 MAD_LIBS="-lmad -lm"],
+		[PKG_CHECK_MODULES(MAD, [libmad],
+		 [INPUT_PLUGINS="$INPUT_PLUGINS madplug"],
+		 [enable_mp3="no"])
+		])
 fi
 # XXX rtsp support
 #        PKG_CHECK_MODULES(LIBNMS,[libnms >= 0.6.0],
@@ -381,6 +386,9 @@
 #        AC_SUBST(LIBNMS_SRC)
 # fi
 
+AC_SUBST(MAD_CFLAGS)
+AC_SUBST(MAD_LIBS)
+
 dnl *** Rocklight
 
 AC_ARG_ENABLE(rocklight,
diff -r 06d2b14562c4 -r 4809787d9d5c src/audiocompress/audacious-glue.c
--- a/src/audiocompress/audacious-glue.c	Sat Oct 20 06:39:14 2007 +0300
+++ b/src/audiocompress/audacious-glue.c	Sat Oct 20 06:39:25 2007 +0300
@@ -13,7 +13,7 @@
 #include <audacious/util.h>
 #include <audacious/configdb.h>
 
-#include "config.h"
+#include "audiocompress_config.h"
 #include "compress.h"
 
 typedef struct {
diff -r 06d2b14562c4 -r 4809787d9d5c src/audiocompress/audiocompress_config.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audiocompress/audiocompress_config.h	Sat Oct 20 06:39:25 2007 +0300
@@ -0,0 +1,25 @@
+/* audiocompress_config.h
+** Default values for the configuration, and also a few random debug things
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+/*** Version information ***/
+#define ACVERSION "1.5.2"
+
+/*** Monitoring stuff ***/
+//#define DEBUG			/* Show debugging information */
+//#define STATS			/* Show statistics on stderr */
+
+/*** Default configuration stuff ***/
+#define ANTICLIP 0		/* Strict clipping protection */
+#define TARGET 25000		/* Target level */
+
+#define GAINMAX 32		/* The maximum amount to amplify by */
+#define GAINSHIFT 10		/* How fine-grained the gain is */
+#define GAINSMOOTH 8		/* How much inertia ramping has*/
+#define BUCKETS 400		/* How long of a history to store */
+
+#endif
+
diff -r 06d2b14562c4 -r 4809787d9d5c src/audiocompress/compress.c
--- a/src/audiocompress/compress.c	Sat Oct 20 06:39:14 2007 +0300
+++ b/src/audiocompress/compress.c	Sat Oct 20 06:39:25 2007 +0300
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "config.h"
+#include "audiocompress_config.h"
 #include "compress.h"
 
 static int *peaks = NULL;
diff -r 06d2b14562c4 -r 4809787d9d5c src/audiocompress/config.h
--- a/src/audiocompress/config.h	Sat Oct 20 06:39:14 2007 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/* config.h
-** Default values for the configuration, and also a few random debug things
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-/*** Version information ***/
-#define ACVERSION "1.5.2"
-
-/*** Monitoring stuff ***/
-//#define DEBUG			/* Show debugging information */
-//#define STATS			/* Show statistics on stderr */
-
-/*** Default configuration stuff ***/
-#define ANTICLIP 0		/* Strict clipping protection */
-#define TARGET 25000		/* Target level */
-
-#define GAINMAX 32		/* The maximum amount to amplify by */
-#define GAINSHIFT 10		/* How fine-grained the gain is */
-#define GAINSMOOTH 8		/* How much inertia ramping has*/
-#define BUCKETS 400		/* How long of a history to store */
-
-#endif
-