# HG changeset patch
# User chainsaw
# Date 1136758446 28800
# Node ID 5928c035fa4e38ace09434d2720d98ae192e8649
# Parent  e23a39947f4cf265bc37041503ed06f60e4decbe
[svn] Use the pkg-config database to link with libbinio in a portable way. Requires libbinio 1.4 (or higher).

diff -r e23a39947f4c -r 5928c035fa4e Plugins/Input/adplug/Makefile.am
--- a/Plugins/Input/adplug/Makefile.am	Sun Jan 08 13:39:07 2006 -0800
+++ b/Plugins/Input/adplug/Makefile.am	Sun Jan 08 14:14:06 2006 -0800
@@ -7,8 +7,8 @@
 
 libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-libadplug_la_LDFLAGS = -lstdc++ -lbinio $(PLUGIN_LDFLAGS) ./core/libadplugcore.la
+libadplug_la_LDFLAGS = -lstdc++ $(BINIO_LIBS) $(PLUGIN_LDFLAGS) ./core/libadplugcore.la
 
 libadplug_la_SOURCES = adplug-xmms.cc
 
-INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I./core -I/usr/include/libbinio
+INCLUDES = $(GTK_CFLAGS) $(BINIO_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I./core
diff -r e23a39947f4c -r 5928c035fa4e Plugins/Input/adplug/core/Makefile.am
--- a/Plugins/Input/adplug/core/Makefile.am	Sun Jan 08 13:39:07 2006 -0800
+++ b/Plugins/Input/adplug/core/Makefile.am	Sun Jan 08 14:14:06 2006 -0800
@@ -18,3 +18,5 @@
 protrack.h rad.h raw.h sa2.h sng.h u6m.h player.h fmc.h mad.h xad.h bmf.h \
 flash.h hyp.h psi.h rat.h hybrid.h rol.h adtrack.h cff.h dtm.h fprovide.h \
 database.h players.h xsm.h adlibemu.h kemuopl.h dro.h dmo.h s3m.h
+
+INCLUDES = $(BINIO_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir)
diff -r e23a39947f4c -r 5928c035fa4e configure.ac
--- a/configure.ac	Sun Jan 08 13:39:07 2006 -0800
+++ b/configure.ac	Sun Jan 08 14:14:06 2006 -0800
@@ -317,8 +317,8 @@
 )
 
 if test "$enable_adplug" = "yes"; then
-    AC_CHECK_LIB([binio],[main],[have_adplug=yes],[have_adplug=no])
-    AC_CHECK_HEADER(binio.h,,[have_adplug=no])
+    have_adplug="yes"
+    PKG_CHECK_MODULES(BINIO,[libbinio >= 1.4],,[have_adplug=no])
 else
     AC_MSG_RESULT([*** AdPlug plugin disabled per user request ***])
     have_adplug="no"