changeset 748:559c68ce2e3d trunk

[svn] - using mad.pc makes us dependant on a nonstandard packaging of mad -- which causes breakage on some operating systems
author nenolod
date Wed, 28 Feb 2007 02:14:00 -0800
parents fab906be0f55
children 26ff35aa9b2b
files ChangeLog configure.ac src/madplug/Makefile
diffstat 3 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 27 23:32:10 2007 -0800
+++ b/ChangeLog	Wed Feb 28 02:14:00 2007 -0800
@@ -1,3 +1,12 @@
+2007-02-28 07:32:10 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1592]
+  - add czech translation file. Closes #818.
+  
+  trunk/po/LINGUAS |    1 
+  trunk/po/cs.po   | 6610 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  2 files changed, 6611 insertions(+)
+
+
 2007-02-28 00:51:52 +0000  Giacomo Lozito <james@develia.org>
   revision [1590]
   - aosd: replaced other occurrencies of glib18n with audacious i18n
--- a/configure.ac	Tue Feb 27 23:32:10 2007 -0800
+++ b/configure.ac	Wed Feb 28 02:14:00 2007 -0800
@@ -264,8 +264,9 @@
 )
 
 if test "$enable_mp3" = "yes"; then
-	PKG_CHECK_MODULES(MAD, [mad],
-	     [INPUT_PLUGINS="$INPUT_PLUGINS madplug"], [enable_mp3="no"])
+        AC_CHECK_LIB(mad, mad_timer_add,
+		[INPUT_PLUGINS="$INPUT_PLUGINS madplug"],
+		[enable_mp3="no"])
 fi
 # XXX rtsp support
 #        PKG_CHECK_MODULES(LIBNMS,[libnms >= 0.6.0],
--- a/src/madplug/Makefile	Tue Feb 27 23:32:10 2007 -0800
+++ b/src/madplug/Makefile	Wed Feb 28 02:14:00 2007 -0800
@@ -17,10 +17,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS   += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(MAD_CFLAGS) -I../../intl -I../.. -Wall
+CFLAGS   += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. -Wall
 
 LDFLAGS += -Wl,-rpath=$(plugindir)
 
-LIBADD = -L$(plugindir) -laudid3tag $(MAD_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+LIBADD = -L$(plugindir) -laudid3tag -lmad $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 include ../../mk/objective.mk