backport [13095]

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 13abc952a4c909f8039bb4f20eb180e2d491883a..4a9e423b6b3e676ba86eac4f317a9e965d038daa 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -127,8 +127,8 @@ dnl  Private VLC macros - generated by bootstrap
 EOF
 
 if [ "${PKGCONFIG}" = "no" ]; then cat >> m4/private.m4 << EOF
-dnl  User does not have pkg-config, so this is a no-op
-AC_DEFUN([PKG_CHECK_MODULES], [:], [], [], [])
+dnl  User does not have pkg-config, so assume package was not found
+AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
 
 EOF
 fi
@@ -218,7 +218,7 @@ all-modules:
 
 # Build a plugin with the adequate linker and linker's flags
 _plugin.a_plugin\$(LIBEXT):
-       @mod="\$*" ; mod=\$\${mod:3} ; \
+       @mod="\$*" ; mod=\$\${mod#lib} ; \
        ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
        case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
          c++)  ld="\$(CXXLINK)" ;; \