# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1192789640 18000
# Node ID 6e4ad45c21d6b8be7f753dfcc34258b2c15416db
# Parent  1c152e912fe9df751c223f7d3a8288b45c81d8de
make it build on MacOS again

diff -r 1c152e912fe9 -r 6e4ad45c21d6 configure.ac
--- a/configure.ac	Thu Oct 18 21:40:46 2007 +0200
+++ b/configure.ac	Fri Oct 19 05:27:20 2007 -0500
@@ -1463,7 +1463,7 @@
 if test "$enable_filewriter_mp3" = "yes"; then
    AC_CHECK_LIB(mp3lame -lm, lame_init, [have_lame=yes], [have_lame=no])
    if test "$have_lame" = yes; then
-      AC_DEFINE(FILEWRITER_MP3, 1, [Define if Vorbis output part should be built])
+      AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
 	  FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
    fi
 fi
@@ -1479,6 +1479,7 @@
    [have_vorbisenc=yes], [have_vorbisenc=no])
    if test "$have_vorbisenc" = yes; then
       AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
+      FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS  `pkg-config --cflags vorbisenc`"
       FILEWRITER_LIBS="$FILEWRITER_LIBS  `pkg-config --libs vorbisenc`"
    fi
 fi
@@ -1495,6 +1496,7 @@
    )
    if test "$have_writer_flac" = yes; then
       AC_DEFINE(FILEWRITER_FLAC, 1, [Define if FLAC output part should be built])
+	  FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS  `pkg-config --cflags flac`"
 	  FILEWRITER_LIBS="$FILEWRITER_LIBS  `pkg-config --libs flac`"
    fi
 fi
@@ -1505,6 +1507,7 @@
    have_writer_flac=no
    FILEWRITER_LIBS=""
 fi
+AC_SUBST(FILEWRITER_CFLAGS)
 AC_SUBST(FILEWRITER_LIBS)
 
 dnl *** End of all plugin checks ***
diff -r 1c152e912fe9 -r 6e4ad45c21d6 extra.mk.in
--- a/extra.mk.in	Thu Oct 18 21:40:46 2007 +0200
+++ b/extra.mk.in	Fri Oct 19 05:27:20 2007 -0500
@@ -365,6 +365,7 @@
 IMLIB2_CFLAGS ?= @IMLIB2_CFLAGS@
 IMLIB2_LIBS ?= @IMLIB2_LIBS@
 SIMD_CFLAGS ?= @SIMD_CFLAGS@
+FILEWRITER_CFLAGS ?= @FILEWRITER_CFLAGS@
 FILEWRITER_LIBS ?= @FILEWRITER_LIBS@
 GCC42_CFLAGS ?= @GCC42_CFLAGS@
 CDIO_LIBS ?= @CDIO_LIBS@
diff -r 1c152e912fe9 -r 6e4ad45c21d6 src/filewriter/Makefile
--- a/src/filewriter/Makefile	Thu Oct 18 21:40:46 2007 +0200
+++ b/src/filewriter/Makefile	Fri Oct 19 05:27:20 2007 -0500
@@ -12,5 +12,5 @@
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${FILEWRITER_CFLAGS} ${OGG_VORBIS_CFLAGS} -I../../intl -I../..
 LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS}
diff -r 1c152e912fe9 -r 6e4ad45c21d6 src/madplug/Makefile
--- a/src/madplug/Makefile	Thu Oct 18 21:40:46 2007 +0200
+++ b/src/madplug/Makefile	Fri Oct 19 05:27:20 2007 -0500
@@ -15,5 +15,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../..
-LIBS += -L${libdir} -lmad -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} ${MAD_CFLAGS} -I../..
+LIBS += ${MAD_LIBS} -L${libdir} -lmad -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r 1c152e912fe9 -r 6e4ad45c21d6 src/paranormal/plugin.c
--- a/src/paranormal/plugin.c	Thu Oct 18 21:40:46 2007 +0200
+++ b/src/paranormal/plugin.c	Fri Oct 19 05:27:20 2007 -0500
@@ -39,8 +39,8 @@
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
 #include <audacious/util.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_thread.h>
+#include <SDL.h>
+#include <SDL_thread.h>
 
 #include "paranormal.h"
 #include "actuators.h"