diff -uprN vlc-0.9.0-svn/modules/genmf vlc-0.9.0-svn.az/modules/genmf
--- vlc-0.9.0-svn/modules/genmf	2007-09-01 18:58:35.000000000 +0200
+++ vlc-0.9.0-svn.az/modules/genmf	2007-10-13 17:13:30.000000000 +0200
@@ -46,7 +46,7 @@ EXTRA_LTLIBRARIES = ${extra_ltlibs}
 include Modules.am
 
 if HAVE_PLUGINS
-LTLIBVLC = -L\$(top_builddir)/src -lvlc
+LTLIBVLC = \$(top_builddir)/src/libvlc.la
 
 AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\
 	-module -no-undefined -shrext \$(LIBEXT) 
@@ -141,8 +141,10 @@ EOF
 lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
 lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
 lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
-lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \$(AM_LDFLAGS)
-lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD)
+lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS)
+lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \`\$(VLC_CONFIG) -Lplugins plugin ${mod}\`
+# Need to add _la_DEPENDENCIES manually, else automake gets the VLC_CONFIG stuff wrong
+lib${mod}_plugin_la_DEPENDENCIES = \$(AM_LIBADD)
 EOF
   done
 
diff -uprN vlc-0.9.0-svn/vlc-config.in.in vlc-0.9.0-svn.az/vlc-config.in.in
--- vlc-0.9.0-svn/vlc-config.in.in	2007-07-17 13:05:30.000000000 +0200
+++ vlc-0.9.0-svn.az/vlc-config.in.in	2007-10-13 17:13:48.000000000 +0200
@@ -193,7 +193,7 @@ while test $# -gt 0; do
     --objcflags)
       echo_objcflags=yes
       ;;
-    --libs)
+    --libs|-Lplugins)
       echo_libs=yes
       ;;
     -*)
@@ -337,3 +337,4 @@ if test "${echo_libs}" = yes; then
   fi
   echo "${libs} ${ldflags}"
 fi
+