# HG changeset patch # User Vitaly Lipatov # Date 1193531686 18000 # Node ID 76f9a4168708de72dc94200455666a6922a80cdf # Parent ae36702ffcf9d2889a7b38e83ddfd010c66ab9ba Fix linking with libaudid3tag Linking with libaudid3tag from /usr/lib/audacious, add rpath (affected to tta, shnplug and madplug plugins) diff -r ae36702ffcf9 -r 76f9a4168708 configure.ac --- a/configure.ac Sat Oct 27 19:32:22 2007 -0500 +++ b/configure.ac Sat Oct 27 19:34:46 2007 -0500 @@ -213,7 +213,7 @@ PICFLAGS="-fPIC -DPIC" PICLDFLAGS="-fPIC -DPIC -shared" LIBLDFLAGS="-fPIC -DPIC -shared" - AUDLDFLAGS="-Wl,-export-dynamic -Wl,-rpath=\${libdir},-rpath=\${plugindir}" + AUDLDFLAGS="-L${plugindir} -Wl,-export-dynamic -Wl,-rpath=\${plugindir}" SHARED_SUFFIX=".so" ;; esac diff -r ae36702ffcf9 -r 76f9a4168708 src/madplug/Makefile --- a/src/madplug/Makefile Sat Oct 27 19:32:22 2007 -0500 +++ b/src/madplug/Makefile Sat Oct 27 19:34:46 2007 -0500 @@ -16,4 +16,5 @@ CFLAGS += ${PLUGIN_CFLAGS} CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} ${MAD_CFLAGS} -I../.. +LDFLAGS += -${AUDLDFLAGS} LIBS += ${MAD_LIBS} -L${libdir} -lmad -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} diff -r ae36702ffcf9 -r 76f9a4168708 src/shnplug/Makefile --- a/src/shnplug/Makefile Sat Oct 27 19:32:22 2007 -0500 +++ b/src/shnplug/Makefile Sat Oct 27 19:34:46 2007 -0500 @@ -25,5 +25,3 @@ ${PANGO_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../../intl -I../.. -Wall LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -# These were the additional link flags in the old Makefile: -# -L/opt/local/lib -L${plugindir} -laudid3tag -Wl,-rpath=${plugindir} diff -r ae36702ffcf9 -r 76f9a4168708 src/tta/Makefile --- a/src/tta/Makefile Sat Oct 27 19:32:22 2007 -0500 +++ b/src/tta/Makefile Sat Oct 27 19:34:46 2007 -0500 @@ -10,4 +10,5 @@ CFLAGS += ${PLUGIN_CFLAGS} CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. +LDFLAGS += -${AUDLDFLAGS} LIBS += -L${libdir} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -laudid3tag