# HG changeset patch
# User giacomo
# Date 1158715602 25200
# Node ID f15e55bc0e60b160d0caa6e2e155639553439eb4
# Parent  3643db656a4fc2f68e03876e0b8e70e960a4bea2
[svn] - fixed some issues for amidiplug compilation after migraton in audacious-plugins (backends were not compiled and amidiplug was uselessly installed twice on make install)

diff -r 3643db656a4f -r f15e55bc0e60 ChangeLog
--- a/ChangeLog	Tue Sep 19 07:53:54 2006 -0700
+++ b/ChangeLog	Tue Sep 19 18:26:42 2006 -0700
@@ -1,3 +1,15 @@
+2006-09-19 14:53:54 +0000  Jonathan Schleifer <js@h3c.de>
+  revision [78]
+  Removed the check for socklen_t. This fixes building on NetBSD.
+  curl defined socklen_t anyway, so no need for this.
+  This *MIGHT* break something on some systems (I haven't found one yet,
+  though), so PLEASE report all bugs to me.
+  
+
+  Changes:        Modified:
+  +0 -17          trunk/configure.ac  
+
+
 2006-09-18 20:43:46 +0000  William Pitcock <nenolod@nenolod.net>
   revision [76]
   - version bump to 1.2.1
diff -r 3643db656a4f -r f15e55bc0e60 configure.ac
--- a/configure.ac	Tue Sep 19 07:53:54 2006 -0700
+++ b/configure.ac	Tue Sep 19 18:26:42 2006 -0700
@@ -728,7 +728,7 @@
   INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
   PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0],,)
   PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.6.0],,)
-  AMIDIPLUGBACKENDDIR=${libdir}/amidi-plug/backends
+  AMIDIPLUGBACKENDDIR=${libdir}/amidi-plug/audacious
   AC_SUBST(AMIDIPLUGBACKENDDIR)
   if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then
     if test "x$alsalib_available" = "xcheck"; then
@@ -771,10 +771,6 @@
   AC_SUBST(AMIDIPLUG_BACKENDS)
 fi
 
-if test "x$enable_amidiplug" = "xyes"; then
-  INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
-fi
-
 
 dnl *** TiMidity input plugin (note: should appear somewhere after the amidi-plug check)
 
diff -r 3643db656a4f -r f15e55bc0e60 mk/rules.mk.in
--- a/mk/rules.mk.in	Tue Sep 19 07:53:54 2006 -0700
+++ b/mk/rules.mk.in	Tue Sep 19 18:26:42 2006 -0700
@@ -63,6 +63,7 @@
 AMDEP_FALSE ?= @AMDEP_FALSE@
 AMDEP_TRUE ?= @AMDEP_TRUE@
 AMIDIPLUGBACKENDDIR ?= @AMIDIPLUGBACKENDDIR@
+AMIDIPLUG_BACKENDS ?= @AMIDIPLUG_BACKENDS@
 AMTAR ?= @AMTAR@
 AR ?= @AR@
 ARCH_DEFINES ?= @ARCH_DEFINES@
diff -r 3643db656a4f -r f15e55bc0e60 src/amidi-plug/Makefile
--- a/src/amidi-plug/Makefile	Tue Sep 19 07:53:54 2006 -0700
+++ b/src/amidi-plug/Makefile	Tue Sep 19 18:26:42 2006 -0700
@@ -2,7 +2,7 @@
 include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libamidi-plug$(SHARED_SUFFIX)
-SUBDIRS = pcfg 
+SUBDIRS = pcfg $(AMIDIPLUG_BACKENDS)
 
 noinst_HEADERS = amidi-plug.h i_backend.h i_midi.h i_midievent.h \
                  i_configure.h i_configure_private.h \